diff options
| -rw-r--r-- | core/Makefile | 8 | ||||
| -rw-r--r-- | core/product_config.mk | 15 | ||||
| -rw-r--r-- | target/product/full_base.mk | 2 | ||||
| -rw-r--r-- | target/product/sdk_base.mk | 6 |
4 files changed, 5 insertions, 26 deletions
diff --git a/core/Makefile b/core/Makefile index ce13301..eb3b1c3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -757,12 +757,8 @@ ifneq (,$(PRODUCT_AAPT_PREF_CONFIG)) # If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value. recovery_density := $(filter %dpi,$(PRODUCT_AAPT_PREF_CONFIG)) else -# Otherwise, use the highest density that appears in PRODUCT_AAPT_CONFIG. -# Order is important here; we'll take the first one that's found. -recovery_densities := $(filter $(PRODUCT_AAPT_CONFIG_SP),xxxhdpi xxhdpi xhdpi hdpi tvdpi mdpi ldpi) -ifneq (,$(recovery_densities)) -recovery_density := $(word 1,$(recovery_densities)) -endif +# Otherwise, use the default medium density. +recovery_densities := mdpi endif ifneq (,$(wildcard $(recovery_resources_common)-$(recovery_density))) diff --git a/core/product_config.mk b/core/product_config.mk index d4ba364..1efff2f 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -304,28 +304,15 @@ ifneq (,$(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) +PRODUCT_AAPT_CONFIG := $(strip $(PRODUCT_LOCALES) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_CONFIG)) PRODUCT_AAPT_PREF_CONFIG := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_PREF_CONFIG)) -# Default to medium-density assets. -# (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)) -PRODUCT_AAPT_PREF_CONFIG := $(strip $(PRODUCT_AAPT_PREF_CONFIG)) - -# Everyone gets nodpi and anydpi assets which are density-independent. -PRODUCT_AAPT_CONFIG += nodpi anydpi - # Keep a copy of the space-separated config PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG) # Convert spaces to commas. PRODUCT_AAPT_CONFIG := \ $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_CONFIG))) -PRODUCT_AAPT_PREF_CONFIG := \ - $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_PREF_CONFIG))) # product-scoped aapt flags PRODUCT_AAPT_FLAGS := diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 9b1a826..caace76 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -48,7 +48,7 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_LOCALES := en_US # Include drawables for all densities -PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi +PRODUCT_AAPT_CONFIG := normal # Get some sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk index 8610169..451c0b7 100644 --- a/target/product/sdk_base.mk +++ b/target/product/sdk_base.mk @@ -95,14 +95,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) -include external/svox/pico/lang/PicoLangFrFrInSystem.mk -include external/svox/pico/lang/PicoLangItItInSystem.mk -# locale + densities. en_US is both first and in alphabetical order to +# locale. en_US is both first and in alphabetical order to # ensure this is the default locale. PRODUCT_LOCALES := \ en_US \ - ldpi \ - hdpi \ - mdpi \ - xhdpi \ ar_EG \ ar_IL \ bg_BG \ |