summaryrefslogtreecommitdiffstats
path: root/core/product_config.mk
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-20 07:38:28 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-20 07:38:28 -0800
commit4d23ccc023c8b98eb97a7cce820aa80bff2f3522 (patch)
tree9d28fb439d1c7d37ec01058072c0542e8d6fa763 /core/product_config.mk
parent41977d7cd2f0676a1b135a0991545721d6dce3ef (diff)
downloadreplicant_build-4d23ccc023c8b98eb97a7cce820aa80bff2f3522.zip
replicant_build-4d23ccc023c8b98eb97a7cce820aa80bff2f3522.tar.gz
replicant_build-4d23ccc023c8b98eb97a7cce820aa80bff2f3522.tar.bz2
auto import from //branches/cupcake/...@132569
Diffstat (limited to 'core/product_config.mk')
-rw-r--r--core/product_config.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk
index a9021cc..93671f4 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -149,6 +149,15 @@ TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)
PRODUCT_LOCALES := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_LOCALES))
# TODO: also keep track of things like "port", "land" in product files.
+# If CUSTOM_LOCALES contains any locales not already included
+# in PRODUCT_LOCALES, add them to PRODUCT_LOCALES.
+extra_locales := $(filter-out $(PRODUCT_LOCALES),$(CUSTOM_LOCALES))
+ifneq (,$(extra_locales))
+ $(info Adding CUSTOM_LOCALES [$(extra_locales)] to PRODUCT_LOCALES [$(PRODUCT_LOCALES)])
+ PRODUCT_LOCALES += $(extra_locales)
+ extra_locales :=
+endif
+
# Assemble the list of options.
PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES)