diff options
| author | Ying Wang <wangying@google.com> | 2014-07-09 10:57:32 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-09 10:57:32 -0700 |
| commit | edfd55ae999eb7bfc932cfa88a1a8dcd6bad1169 (patch) | |
| tree | 635901ad24abc73fc416970611de151a7eb019d1 /core/dex_preopt_odex_install.mk | |
| parent | 02a5b51798b06434b08ffe2f6e6c485e73cd42bc (diff) | |
| download | build-edfd55ae999eb7bfc932cfa88a1a8dcd6bad1169.zip build-edfd55ae999eb7bfc932cfa88a1a8dcd6bad1169.tar.gz build-edfd55ae999eb7bfc932cfa88a1a8dcd6bad1169.tar.bz2 | |
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index caaa16d..613b058 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -9,11 +9,13 @@ ifneq (true,$(WITH_DEXPREOPT)) else # WITH_DEXPREOPT=true ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined - ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty - LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) - else # LOCAL_APK_LIBRARIES not empty - LOCAL_DEX_PREOPT := nostripping - endif # LOCAL_APK_LIBRARIES not empty + ifneq ($(filter $(TARGET_OUT)/%,$(my_module_path)),) # Installed to system.img. + ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty + LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) + else # LOCAL_APK_LIBRARIES not empty + LOCAL_DEX_PREOPT := nostripping + endif # LOCAL_APK_LIBRARIES not empty + endif # Installed to system.img. endif # LOCAL_DEX_PREOPT undefined endif # TARGET_BUILD_APPS empty endif # WITH_DEXPREOPT=true |