diff options
| author | Ying Wang <wangying@google.com> | 2014-11-19 00:33:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:33:48 +0000 |
| commit | f9c93d7cbdedfa9dc5f404c14862e18f9bbb773e (patch) | |
| tree | 135134e086d0ec6e058ea6f9788dc7039bd8601e /core/prebuilt_internal.mk | |
| parent | 1dbaf506f46d94d0d54e03e67fb7a8c5c2001bc4 (diff) | |
| parent | 0217e3b20b6a331b0820014dc136d782070bca45 (diff) | |
| download | build-f9c93d7cbdedfa9dc5f404c14862e18f9bbb773e.zip build-f9c93d7cbdedfa9dc5f404c14862e18f9bbb773e.tar.gz build-f9c93d7cbdedfa9dc5f404c14862e18f9bbb773e.tar.bz2 | |
am 0217e3b2: resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp
* commit '0217e3b20b6a331b0820014dc136d782070bca45':
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 7724e79..828b442 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -124,6 +124,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 |