diff options
| author | Ying Wang <wangying@google.com> | 2011-05-26 17:10:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 17:10:37 -0700 |
| commit | 1482d2db83abaa7d9a01831bdaeb99d4a68fd68a (patch) | |
| tree | b05a9be464904c636c202f395e1628dfcbc92777 | |
| parent | c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6 (diff) | |
| parent | e2419c89cef4eeae1b6cd113ef1c92d397834841 (diff) | |
| download | build-1482d2db83abaa7d9a01831bdaeb99d4a68fd68a.zip build-1482d2db83abaa7d9a01831bdaeb99d4a68fd68a.tar.gz build-1482d2db83abaa7d9a01831bdaeb99d4a68fd68a.tar.bz2 | |
am e2419c89: Support to run dex-preopt on prebuilt apks.
* commit 'e2419c89cef4eeae1b6cd113ef1c92d397834841':
Support to run dex-preopt on prebuilt apks.
| -rw-r--r-- | core/prebuilt.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index f5eebc8..8f9eafb 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -16,6 +16,16 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) endif +ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) +ifeq (true,$(WITH_DEXPREOPT)) +ifeq (,$(TARGET_BUILD_APPS)) +ifndef LOCAL_DEX_PREOPT +LOCAL_DEX_PREOPT := true +endif +endif +endif +endif + include $(BUILD_SYSTEM)/base_rules.mk # Deal with the OSX library timestamp issue when installing @@ -30,8 +40,20 @@ PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) # Ensure that prebuilt .apks have been aligned. ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) +ifeq ($(LOCAL_DEX_PREOPT),true) +# Make sure the boot jars get dexpreopt-ed first +$(LOCAL_BUILT_MODULE): $(DEXPREOPT_BOOT_ODEXS) | $(DEXPREOPT) $(DEXOPT) $(AAPT) +endif $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN) $(transform-prebuilt-to-target-with-zipalign) +ifeq ($(LOCAL_DEX_PREOPT),true) + $(hide) rm -f $(patsubst %.apk,%.odex,$@) + $(call dexpreopt-one-file,$@,$(patsubst %.apk,%.odex,$@)) + $(call dexpreopt-remove-classes.dex,$@) + +built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex +$(built_odex): $(LOCAL_BUILT_MODULE) +endif else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) |