am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"

* commit '93cdbd0b81e96649ebb789710429388c054bc377':
  Run zipalign after classes.dex is removed from the apk
This commit is contained in:
Ying Wang 2013-02-25 17:49:28 -08:00 committed by Android Git Automerger
commit 31428917bc
1 changed files with 4 additions and 2 deletions

View File

@ -410,15 +410,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