commit e1b43254b72613e6bf9ac994c1b3f07e0020ed9c
author Ying Wang <wangying@android.com> Fri Jun 27 16:09:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 26 18:33:52 2014 +0000
tree c729e445b55f1d1f73bcd724004df135f091a250
parent 432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c
parent c4dfe6ef30d785219f965e42cd675f99d5d9e0be

Merge "Add --pseudo-localize aapt parameter for builds."

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 97787f4..280a532 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -499,7 +499,7 @@
 
 # Propagate local configuration options to this target.
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)
-$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)
+$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME:= $(LOCAL_MANIFEST_PACKAGE_NAME)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_INSTRUMENTATION_FOR:= $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index f32a596..9468362 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -324,6 +324,13 @@
 PRODUCT_AAPT_PREF_CONFIG := \
     $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_PREF_CONFIG)))
 
+# product-scoped aapt flags
+PRODUCT_AAPT_FLAGS :=
+ifneq ($(filter en_XA ar_XB,$(PRODUCT_LOCALES)),)
+# Force generating resources for pseudo-locales.
+PRODUCT_AAPT_FLAGS += --pseudo-localize
+endif
+
 PRODUCT_BRAND := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BRAND))
 
 PRODUCT_MODEL := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MODEL))