Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60686586 authored by Ying Wang's avatar Ying Wang
Browse files

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
parent 111ba923

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) 


# Select dpi-specific source

ifdef LOCAL_DPI_VARIANTS

my_dpi := $(filter $(LOCAL_DPI_VARIANTS),$(PRODUCT_AAPT_PREF_CONFIG))

my_dpi := $(firstword $(filter $(LOCAL_DPI_VARIANTS),$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)))

ifdef my_dpi

ifdef LOCAL_DPI_FILE_STEM

my_prebuilt_dpi_file_stem := $(LOCAL_DPI_FILE_STEM)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ _product_var_list := \ 
    PRODUCT_LOCALES \

    PRODUCT_AAPT_CONFIG \

    PRODUCT_AAPT_PREF_CONFIG \

    PRODUCT_AAPT_PREBUILT_DPI \

    PRODUCT_PACKAGES \

    PRODUCT_PACKAGES_DEBUG \

    PRODUCT_PACKAGES_ENG \

core/product_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)