diff options
| author | Ying Wang <wangying@android.com> | 2014-06-27 16:24:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-27 16:24:46 +0000 |
| commit | a26a2123b80ad3b4aa3ab8d2d1648dc03ae230b2 (patch) | |
| tree | 9255a29471c50209403c11702392d79a7e3926d0 /core | |
| parent | 0a74bf180a1f3bca62c0ee42904a90bfd6feffa0 (diff) | |
| parent | 7a6a9a558271ac959a2e441fe27aae3df77d4421 (diff) | |
| download | replicant_build-a26a2123b80ad3b4aa3ab8d2d1648dc03ae230b2.zip replicant_build-a26a2123b80ad3b4aa3ab8d2d1648dc03ae230b2.tar.gz replicant_build-a26a2123b80ad3b4aa3ab8d2d1648dc03ae230b2.tar.bz2 | |
am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
Add --pseudo-localize aapt parameter for builds.
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/product_config.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 5406607..969c7de 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -501,7 +501,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 8fa5102..261b935 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -326,6 +326,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)) |