commit 6784cae413a757fc5516cfc344eaf435c6113170
author Adrian Roos <roosa@google.com> Mon Jun 01 18:24:41 2015 -0700
committer Adrian Roos <roosa@google.com> Wed Jun 10 20:00:13 2015 +0000
tree 4c693ede2b76cf20c76e66af0a252109cd63c29a
parent 942a42e31de9a0468014a256ed7fdd67cb208e64

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

diff --git a/core/definitions.mk b/core/definitions.mk
index 474a4e6..9a6fec5 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1664,7 +1664,8 @@
     $(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 @@
     $(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