p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix depfile output from dexpreopt strip script" am: dc1f4499d0 am: da854daf25 

am: 58649bc3a4

Change-Id: Ied537bc59b377193be281bc9eb950d997e40c4c9
This commit is contained in:
Dan Willemsen 2019-01-07 18:40:06 -08:00 committed by android-build-merger
parent 183e47ef1a 58649bc3a4
commit 7c3159ead8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/package_internal.mk
View File

@ -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

6
core/prebuilt_internal.mk
View File

@ -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