Run zipalign after classes.dex is removed from the apk

If LOCAL_DEX_PREOPT is enabled.

Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
This commit is contained in:
Ying Wang 2013-02-25 16:02:42 -08:00
parent 48b6e18f1f
commit f7084ca921
1 changed files with 4 additions and 2 deletions

View File

@ -421,15 +421,17 @@ ifneq ($(extra_jar_args),)
$(add-java-resources-to-package)
endif
$(sign-package)
@# Alignment must happen after all other zip operations.
$(align-package)
ifdef LOCAL_DEX_PREOPT
$(hide) rm -f $(patsubst %.apk,%.odex,$@)
$(call dexpreopt-one-file,$@,$(patsubst %.apk,%.odex,$@))
ifneq (nostripping,$(LOCAL_DEX_PREOPT))
$(call dexpreopt-remove-classes.dex,$@)
endif
endif
@# Alignment must happen after all other zip operations.
$(align-package)
ifdef LOCAL_DEX_PREOPT
built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex
$(built_odex): $(LOCAL_BUILT_MODULE)
endif