Merge "Avoid re-running kati unnecessarily." into main am: 00732c7981

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

Change-Id: Ia511ede0e0e795c78b4e2e3e67a383e4b91413cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-10 00:01:54 +00:00
committed by Automerger Merge Worker

View File

@@ -120,7 +120,8 @@ ifneq (,$(_use_protobuf))
# Disable the build flag in release-config.
_args += --guard=false
endif
$(KATI_shell_no_rerun $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out && touch -t 200001010000 $(OUT_DIR)/release-config.out)
_flags_file:=$(OUT_DIR)/soong/release-config/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).mk
$(KATI_shell_no_rerun $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out 2>&1 && touch -t 200001010000 $(OUT_DIR)/release-config.out $(_flags_file))
$(if $(filter-out 0,$(.SHELLSTATUS)),$(error release-config failed to run))
# This will also set _all_release_configs for us.
$(eval include $(OUT_DIR)/soong/release-config/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).mk)