StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of density in PRODUCT_AAP_CONFIG

Browse Source 
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
This commit is contained in:
Adam Lesinski
2014-12-02 16:13:09 -08:00
parent 8070b20f9e
commit 83ee6d790f
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -757,12 +757,8 @@ ifneq (,$(PRODUCT_AAPT_PREF_CONFIG))
# If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value. # If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value.
recovery_density := $(filter %dpi,$(PRODUCT_AAPT_PREF_CONFIG)) recovery_density := $(filter %dpi,$(PRODUCT_AAPT_PREF_CONFIG))
else else
# Otherwise, use the highest density that appears in PRODUCT_AAPT_CONFIG. # Otherwise, use the default medium density.
# Order is important here; we'll take the first one that's found. recovery_densities := mdpi
recovery_densities := $(filter $(PRODUCT_AAPT_CONFIG_SP),xxxhdpi xxhdpi xhdpi hdpi tvdpi mdpi ldpi)
ifneq (,$(recovery_densities))
recovery_density := $(word 1,$(recovery_densities))
endif
endif endif
ifneq (,$(wildcard $(recovery_resources_common)-$(recovery_density))) ifneq (,$(wildcard $(recovery_resources_common)-$(recovery_density)))

15
core/product_config.mk
View File

@@ -304,28 +304,15 @@ ifneq (,$(extra_locales))
endif endif
# Add PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG # Add PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG
PRODUCT_AAPT_CONFIG := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_CONFIG)) PRODUCT_AAPT_CONFIG := $(strip $(PRODUCT_LOCALES) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_CONFIG))
PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) $(PRODUCT_AAPT_CONFIG)
PRODUCT_AAPT_PREF_CONFIG := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_AAPT_PREF_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 # Keep a copy of the space-separated config
PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG) PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG)
# Convert spaces to commas. # Convert spaces to commas.
PRODUCT_AAPT_CONFIG := \ PRODUCT_AAPT_CONFIG := \
$(subst $(space),$(comma),$(strip $(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-scoped aapt flags
PRODUCT_AAPT_FLAGS := PRODUCT_AAPT_FLAGS :=

2
target/product/full_base.mk
View File

@@ -48,7 +48,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_LOCALES := en_US PRODUCT_LOCALES := en_US
# Include drawables for all densities # Include drawables for all densities
PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi PRODUCT_AAPT_CONFIG := normal
# Get some sounds # Get some sounds
$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)

6
target/product/sdk_base.mk
View File

@@ -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/PicoLangFrFrInSystem.mk
-include external/svox/pico/lang/PicoLangItItInSystem.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. # ensure this is the default locale.
PRODUCT_LOCALES := \ PRODUCT_LOCALES := \
en_US \ en_US \
ldpi \
hdpi \
mdpi \
xhdpi \
ar_EG \ ar_EG \
ar_IL \ ar_IL \
bg_BG \ bg_BG \