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

Commit ded0aec9 authored by Colin Cross's avatar Colin Cross
Browse files

Separate dexpreopt deps from stripping deps 

The strip rule does not need to wait for the boot image to finish,
create a separate DEXPREOPT_STRIP_DEPS list that only contains
tools used by GenerateStripRule in build/soong/dexpreopt/dexpreopt.go.

Bug: 123038675
Test: m checkbuild
Change-Id: I0814c8d99781533f5778e14547d3e9671e06317f
parent d61a1aba

core/dex_preopt_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -209,3 +209,6 @@ ifdef TARGET_2ND_ARCH 
    DEXPREOPT_GEN_DEPS += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

  endif

endif



DEXPREOPT_STRIP_DEPS := \

  $(ZIP2ZIP) \

core/java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ else # ! boot jar 


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

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

$(LOCAL_BUILT_MODULE): | $(DEXPREOPT_GEN_DEPS)

$(LOCAL_BUILT_MODULE): | $(DEXPREOPT_STRIP_DEPS)

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

$(LOCAL_BUILT_MODULE): $(common_javalib.jar)

	$(PRIVATE_STRIP_SCRIPT) $< $@

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ endif 
ifdef LOCAL_DEX_PREOPT

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

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

$(LOCAL_BUILT_MODULE) : | $(DEXPREOPT_GEN_DEPS)

$(LOCAL_BUILT_MODULE) : | $(DEXPREOPT_STRIP_DEPS)

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

endif

$(LOCAL_BUILT_MODULE):

core/prebuilt_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ 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) : | $(DEXPREOPT_STRIP_DEPS)

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

endif

endif
@@ -464,7 +464,7 @@ else # ! boot jar 


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

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

$(built_module): | $(DEXPREOPT_GEN_DEPS)

$(built_module): | $(DEXPREOPT_STRIP_DEPS)

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

$(built_module): $(my_prebuilt_src_file)

	$(PRIVATE_STRIP_SCRIPT) $< $@