diff options
| author | Ying Wang <wangying@google.com> | 2014-11-19 00:23:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:23:00 +0000 |
| commit | a4f415d65ea3bbf375b8b82a7ce5086612914679 (patch) | |
| tree | 7001f995a575fcc11e21c83571d77865d1adc54e /core/prebuilt_internal.mk | |
| parent | 56d5ed1978309ce56256dbca0093054f17709252 (diff) | |
| parent | ea4dfb7551e680f7496e1d35c05bdad10ca58b4a (diff) | |
| download | build-a4f415d65ea3bbf375b8b82a7ce5086612914679.zip build-a4f415d65ea3bbf375b8b82a7ce5086612914679.tar.gz build-a4f415d65ea3bbf375b8b82a7ce5086612914679.tar.bz2 | |
am ea4dfb75: Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
* commit 'ea4dfb7551e680f7496e1d35c05bdad10ca58b4a':
Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 5fcd3be..67c7e29 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -114,6 +114,19 @@ endif # LOCAL_STRIP_MODULE not true ifeq ($(LOCAL_MODULE_CLASS),APPS) 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)) +ifdef my_dpi +ifdef LOCAL_DPI_FILE_STEM +my_prebuilt_dpi_file_stem := $(LOCAL_DPI_FILE_STEM) +else +my_prebuilt_dpi_file_stem := $(LOCAL_MODULE)_%.apk +endif +my_prebuilt_src_file := $(dir $(my_prebuilt_src_file))$(subst %,$(my_dpi),$(my_prebuilt_dpi_file_stem)) +endif # my_dpi +endif # LOCAL_DPI_VARIANTS + rs_compatibility_jni_libs := include $(BUILD_SYSTEM)/install_jni_libs.mk |