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

Commit dc1f4499 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix depfile output from dexpreopt strip script"

parents 9f1eda65 07b73576

core/package_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ ifneq ($(BUILD_PLATFORM_ZIP),) 
	@# Keep a copy of apk with classes.dex unstripped

	$(hide) cp -f $@ $(dir $@)package.dex.apk

endif  # BUILD_PLATFORM_ZIP

	$(PRIVATE_STRIP_SCRIPT) $@ $@.tmp

	mv -f $@.tmp $@

	mv -f $@ $@.tmp

	$(PRIVATE_STRIP_SCRIPT) $@.tmp $@

endif  # LOCAL_DEX_PREOPT

	$(sign-package)

ifdef LOCAL_COMPRESSED_MODULE

core/prebuilt_internal.mk

+4 −2
Original line number Diff line number Diff line
@@ -357,12 +357,14 @@ endif 
ifneq ($(BUILD_PLATFORM_ZIP),)

$(built_module) : .KATI_IMPLICIT_OUTPUTS := $(dir $(LOCAL_BUILT_MODULE))package.dex.apk

endif

ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)

ifdef LOCAL_DEX_PREOPT

$(built_module) : PRIVATE_STRIP_SCRIPT := $(intermediates)/strip.sh

$(built_module) : $(intermediates)/strip.sh

$(built_module) : | $(DEXPREOPT_GEN_DEPS)

$(built_module) : .KATI_DEPFILE := $(built_module).d

endif

endif

$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR)

	$(transform-prebuilt-to-target)

	$(uncompress-prebuilt-embedded-jni-libs)
@@ -387,8 +389,8 @@ endif 
	$(run-appcompat)

endif  # module_run_appcompat

ifdef LOCAL_DEX_PREOPT

	$(PRIVATE_STRIP_SCRIPT) $@ $@.tmp

	mv -f $@.tmp $@

	mv -f $@ $@.tmp

	$(PRIVATE_STRIP_SCRIPT) $@.tmp $@

endif  # LOCAL_DEX_PREOPT

	$(sign-package)

	# No need for align-package because sign-package takes care of alignment