diff options
| author | Ying Wang <wangying@google.com> | 2011-03-15 13:19:30 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-15 13:19:30 -0700 |
| commit | 4f1ab92aac00a73276793ed25af669d112618a32 (patch) | |
| tree | ecfbb02dd36c3d729bdf2df96525198a9944524c /core/product_config.mk | |
| parent | 374b3256d270f9320176330e4f836a1cb3955899 (diff) | |
| download | replicant_build-4f1ab92aac00a73276793ed25af669d112618a32.zip replicant_build-4f1ab92aac00a73276793ed25af669d112618a32.tar.gz replicant_build-4f1ab92aac00a73276793ed25af669d112618a32.tar.bz2 | |
Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG
With this change, PRODUCT_LOCALES will contain only locales.
Other aapt config flags, such as *dpi, small/normal/large/xlarge,
should go to PRODUCT_AAPT_CONFIGS.
Bug: 4086309
Change-Id: I922f153d79777a9522c542a3907111193b40e7b7
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 433fae2..f03db3e 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -226,17 +226,18 @@ ifneq (,$(extra_locales)) extra_locales := endif +# Add PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG +PRODUCT_AAPT_CONFIG := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_CONFIG)) +PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) $(PRODUCT_AAPT_CONFIG) + # Default to medium-density assets. -# (Can be overridden in the device config, e.g.: PRODUCT_LOCALES += hdpi) -PRODUCT_LOCALES := $(strip \ - $(PRODUCT_LOCALES) \ - $(if $(filter %dpi,$(PRODUCT_LOCALES)),,mdpi)) +# (Can be overridden in the device config, e.g.: PRODUCT_AAPT_CONFIG += hdpi) +PRODUCT_AAPT_CONFIG := $(strip \ + $(PRODUCT_AAPT_CONFIG) \ + $(if $(filter %dpi,$(PRODUCT_AAPT_CONFIG)),,mdpi)) # Everyone gets nodpi assets which are density-independent. -PRODUCT_LOCALES += nodpi - -# Assemble the list of options. -PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) +PRODUCT_AAPT_CONFIG += nodpi # Convert spaces to commas. comma := , |