diff options
| author | Ying Wang <wangying@google.com> | 2014-12-10 22:19:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 22:19:49 +0000 |
| commit | 18eee18e6e51da4857054376ad96add16c0c0b92 (patch) | |
| tree | c9b47d82e21198e8e9ec4b2aa6ae87016c939de2 /core/prebuilt_internal.mk | |
| parent | 8750cfc5b5af821c90b224e727729e721c981e78 (diff) | |
| parent | 60686586a5f9c8f78b9ad16e19782da85e89a760 (diff) | |
| download | build-18eee18e6e51da4857054376ad96add16c0c0b92.zip build-18eee18e6e51da4857054376ad96add16c0c0b92.tar.gz build-18eee18e6e51da4857054376ad96add16c0c0b92.tar.bz2 | |
am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '60686586a5f9c8f78b9ad16e19782da85e89a760':
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 67c7e29..bc6088f 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -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) |