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

Commit cc4e318d authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0 

Original change: https://android-review.googlesource.com/c/platform/build/+/3117879



Change-Id: I5043fae20d7b533fe8fa4d1de1aa345c27c2a63f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4401accf d7c448f0

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -787,6 +787,10 @@ $(call add-clean-step, find $(OUT_DIR) -type f -name "*.jar" -print0 | xargs -0 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/)

$(call add-clean-step, find $(OUT_DIR) -type f -name "*.jar" -print0 | xargs -0 rm -f)



# Remove obsolete dexpreopt_config artifacts

$(call add-clean-step, rm -f $(PRODUCT_OUT)/dexpreopt_config/dexpreopt.config)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/dexpreopt_config/dexpreopt_soong.config)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -7055,18 +7055,19 @@ $(DEXPREOPT_CONFIG_ZIP): $(DEX_PREOPT_CONFIG_FOR_MAKE) \ 


endif



$(DEXPREOPT_CONFIG_ZIP): $(SOONG_ZIP)

	$(hide) mkdir -p $(dir $@) $(PRODUCT_OUT)/dexpreopt_config



$(DEXPREOPT_CONFIG_ZIP): PRIVATE_DEXPREOPT_CONFIG_ZIP_PARAMS :=

ifeq (,$(TARGET_BUILD_UNBUNDLED))

ifneq (,$(DEX_PREOPT_CONFIG_FOR_MAKE))

	$(hide) cp $(DEX_PREOPT_CONFIG_FOR_MAKE) $(PRODUCT_OUT)/dexpreopt_config

$(DEXPREOPT_CONFIG_ZIP): PRIVATE_DEXPREOPT_CONFIG_ZIP_PARAMS += -e $(notdir $(DEX_PREOPT_CONFIG_FOR_MAKE)) -f $(DEX_PREOPT_CONFIG_FOR_MAKE)

endif

ifneq (,$(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE))

	$(hide) cp $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE) $(PRODUCT_OUT)/dexpreopt_config

$(DEXPREOPT_CONFIG_ZIP): PRIVATE_DEXPREOPT_CONFIG_ZIP_PARAMS += -e $(notdir $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE)) -f $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE)

endif

endif #!TARGET_BUILD_UNBUNDLED

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/dexpreopt_config -D $(PRODUCT_OUT)/dexpreopt_config



$(DEXPREOPT_CONFIG_ZIP): $(SOONG_ZIP)

	$(hide) mkdir -p $(dir $@) $(PRODUCT_OUT)/dexpreopt_config

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/dexpreopt_config -D $(PRODUCT_OUT)/dexpreopt_config $(PRIVATE_DEXPREOPT_CONFIG_ZIP_PARAMS)



.PHONY: dexpreopt_config_zip

dexpreopt_config_zip: $(DEXPREOPT_CONFIG_ZIP)