StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Avoid re-running kati unnecessarily."" into main am: a32d67dd1a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3092541

Change-Id: I80a408b314d7210a2e3aca781733fbae7f30618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2024-05-16 18:53:04 +00:00
committed by Automerger Merge Worker
parent d9cd64714a a32d67dd1a
commit b1776d9651
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/release_config.mk
View File

@@ -120,8 +120,7 @@ ifneq (,$(_use_protobuf))
# Disable the build flag in release-config.
_args += --guard=false
endif
_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))
$(KATI_shell_no_rerun $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out && touch -t 200001010000 $(OUT_DIR)/release-config.out)
$(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)