diff --git a/core/base_rules.mk b/core/base_rules.mk index 97787f4e4a..280a532522 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -499,7 +499,7 @@ endif # 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) diff --git a/core/product_config.mk b/core/product_config.mk index f32a596471..94683625b8 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -324,6 +324,13 @@ PRODUCT_AAPT_CONFIG := \ 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))