StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 094ab99f: am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

Browse Source 
* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
This commit is contained in:
Ying Wang
2014-07-10 00:42:53 +00:00
committed by Android Git Automerger
parent 703709dba4 094ab99f27
commit cab3ac84c2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/dex_preopt_odex_install.mk
View File

@@ -9,11 +9,13 @@ ifneq (true,$(WITH_DEXPREOPT))
else # WITH_DEXPREOPT=true else # WITH_DEXPREOPT=true
ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty
ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined
ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty ifneq ($(filter $(TARGET_OUT)/%,$(my_module_path)),) # Installed to system.img.
LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty
else # LOCAL_APK_LIBRARIES not empty LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
LOCAL_DEX_PREOPT := nostripping else # LOCAL_APK_LIBRARIES not empty
endif # 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 # LOCAL_DEX_PREOPT undefined
endif # TARGET_BUILD_APPS empty endif # TARGET_BUILD_APPS empty
endif # WITH_DEXPREOPT=true endif # WITH_DEXPREOPT=true