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

Commit 93cdbd0b authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Run zipalign after classes.dex is removed from the apk"

parents 0426da29 7f7d4d93

core/package.mk

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