diff options
| author | Ying Wang <wangying@google.com> | 2014-12-11 00:07:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 00:07:38 +0000 |
| commit | b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea (patch) | |
| tree | c7bbf57f65c24f1d83da2b0ddcb18175157552f3 /core/prebuilt_internal.mk | |
| parent | 904e88b5bed7a0be84057382d2c433e95d8096b7 (diff) | |
| parent | 18eee18e6e51da4857054376ad96add16c0c0b92 (diff) | |
| download | build-b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea.zip build-b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea.tar.gz build-b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea.tar.bz2 | |
am 18eee18e: am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '18eee18e6e51da4857054376ad96add16c0c0b92':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index c19b278..e486531 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -119,7 +119,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) |