Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31428917 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '93cdbd0b':
  Run zipalign after classes.dex is removed from the apk
parents 757e212c 93cdbd0b

core/package.mk

+4 −2
Original line number Diff line number Diff line
@@ -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