diff options
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 4f4f97d..df5d30e 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -124,15 +124,6 @@ ifdef product_goals default_goal_substitution := tests-build-target endif - # Hack to make the linux build servers use dexpreopt (emulator-based - # preoptimization). Most engineers don't use this type of target - # ("make PRODUCT-blah-user"), so this should only tend to happen when - # using buildbot. - # TODO: Remove this once host Dalvik preoptimization is working. - ifeq ($(TARGET_BUILD_VARIANT),user) - WITH_DEXPREOPT_buildbot := true - endif - # Replace the PRODUCT-* goal with the build goal that it refers to. # Note that this will ensure that it appears in the same relative # position, in case it matters. @@ -226,17 +217,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 := , |