diff options
| author | 2024-05-16 18:22:26 +0000 | |
|---|---|---|
| committer | 2024-05-16 18:24:41 +0000 | |
| commit | dd2f3ec91fc6e20828b876dc397131ace8f336fe (patch) | |
| tree | 0454fc590b093fb6a1d8ee7ec35bb2a4587cd9e4 | |
| parent | 3f0eba2bdcd5ad50a03915459bdda4fc3bad75fe (diff) | |
Revert "Avoid re-running kati unnecessarily."
This reverts commit 3f0eba2bdcd5ad50a03915459bdda4fc3bad75fe.
Reason for revert: Causes build flag changes to be ignored sometimes. Better fix is in progress.
Merged-In: Ic85be1da3765656cef8da4ec03d0b1ca7d5d625e
Change-Id: I2c06770b2ff86c69a5de89962ab9bf48bedfe6fe
| -rw-r--r-- | core/release_config.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/release_config.mk b/core/release_config.mk index 97c8dd3571..bb519804d1 100644 --- a/core/release_config.mk +++ b/core/release_config.mk @@ -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) |