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

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

Browse Source 
* 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
parent 757e212ca2 93cdbd0b81
commit 31428917bc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/package.mk
View File

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