summaryrefslogtreecommitdiffstats
path: root/core/product_config.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-12-10 12:40:09 -0800
committerYing Wang <wangying@google.com>2014-12-10 12:40:09 -0800
commit60686586a5f9c8f78b9ad16e19782da85e89a760 (patch)
tree60eae5629b1efdc68ea10a54a19364623a2b6652 /core/product_config.mk
parent111ba923bec7e99d3ee49688f7ad426b760f8b36 (diff)
downloadbuild-60686586a5f9c8f78b9ad16e19782da85e89a760.zip
build-60686586a5f9c8f78b9ad16e19782da85e89a760.tar.gz
build-60686586a5f9c8f78b9ad16e19782da85e89a760.tar.bz2
Add product variable PRODUCT_AAPT_PREBUILT_DPI
We use search LOCAL_DPI_VARIANTS in the list of "$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)" and the first takes precedence. That way if we don't have a best match, we fall back to the second best, the way how it worked with PRODUCT_AAPT_CONFIG previously. Bug: 18388705 Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
Diffstat (limited to 'core/product_config.mk')
-rw-r--r--core/product_config.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk
index 1efff2f..e7fa75e 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -306,6 +306,7 @@ endif
# Add PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG
PRODUCT_AAPT_CONFIG := $(strip $(PRODUCT_LOCALES) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_CONFIG))
PRODUCT_AAPT_PREF_CONFIG := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_PREF_CONFIG))
+PRODUCT_AAPT_PREBUILT_DPI := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_PREBUILT_DPI))
# Keep a copy of the space-separated config
PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG)