diff options
| author | Ying Wang <wangying@google.com> | 2011-06-02 14:06:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 14:06:24 -0700 |
| commit | 32945410b9b30338334069c6c5f435baa9aefa5d (patch) | |
| tree | 137f9ee979a8c793dde1490f24aba53ef2d938d4 /core | |
| parent | e804fc92ec3c19d136a86703a34d954d42cfeca6 (diff) | |
| parent | bb567df00abfe33d800339eba089b8cfd91a7785 (diff) | |
| download | build-32945410b9b30338334069c6c5f435baa9aefa5d.zip build-32945410b9b30338334069c6c5f435baa9aefa5d.tar.gz build-32945410b9b30338334069c6c5f435baa9aefa5d.tar.bz2 | |
am bb567df0: am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit 'bb567df00abfe33d800339eba089b8cfd91a7785':
Support to run dex-preopt on prebuilt apks.
Diffstat (limited to 'core')
| -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) |