diff options
| author | 2024-05-16 18:36:49 +0000 | |
|---|---|---|
| committer | 2024-05-16 18:36:49 +0000 | |
| commit | a32d67dd1af6e74c0d102a1b33b2135a1303bbf7 (patch) | |
| tree | 1a1b160f19651b5b97efe1c302b827b87953cc23 | |
| parent | 66236c471c708be7fc587c95752b41cae9c9b9ee (diff) | |
| parent | dd2f3ec91fc6e20828b876dc397131ace8f336fe (diff) | |
Merge "Revert "Avoid re-running kati unnecessarily."" into main
| -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) |