diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-09 23:38:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-09 23:38:41 +0000 |
| commit | 00732c79810312601b412b33f8d5cb2316f98bc6 (patch) | |
| tree | b9957e0dad80469e67a2d84ab0afffb2ecd89bce /core | |
| parent | 9d21525b85d641259e42e485d103a3289df2c97c (diff) | |
| parent | 3f0eba2bdcd5ad50a03915459bdda4fc3bad75fe (diff) | |
| download | build-00732c79810312601b412b33f8d5cb2316f98bc6.tar.gz | |
Merge "Avoid re-running kati unnecessarily." into main
Diffstat (limited to 'core')
| -rw-r--r-- | core/release_config.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/release_config.mk b/core/release_config.mk index bb519804d1..97c8dd3571 100644 --- a/core/release_config.mk +++ b/core/release_config.mk @@ -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) |