From 6784cae413a757fc5516cfc344eaf435c6113170 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 1 Jun 2015 18:24:41 -0700 Subject: [PATCH] Switch build to stricter aapt symbol generation Prevents aapt from generating java symbols for strings that don't have a default localization. Bug: 21537397 Change-Id: I2f17397e33d823045f7dcff02e3d0817f3f81849 --- core/definitions.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index 474a4e6ab..9a6fec509 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1664,7 +1664,8 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \ $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \ $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ - $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) + $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) \ + --skip-symbols-without-default-localization endef ifeq ($(HOST_OS),windows) @@ -2013,6 +2014,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \ $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) \ + --skip-symbols-without-default-localization \ -F $@ endef