commit 22135a0b0c25ffe3224eb5e09b9f818b97a62b9e
author Cole Faust <colefaust@google.com> Wed May 22 16:58:35 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 22 16:58:35 2024 +0000
tree aecf56d2ed981f2003ecd8612d4ab99fd2277ef5
parent 802de330d3e3281e2b1afbf56d61a9be9acd957c
parent 50dc47d13aa680b44abfb1384fa63c6ba18361e2

Merge "Show release-config's stderr" into main

core/release_config.mk

diff --git a/core/release_config.mk b/core/release_config.mk
index 5fe3d39..e3ec3a0 100644
--- a/core/release_config.mk
+++ b/core/release_config.mk
@@ -133,7 +133,7 @@
     _flags_file:=$(OUT_DIR)/soong/release-config/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars
     # release-config generates $(_flags_varmk)
     _flags_varmk:=$(_flags_file:.vars=.varmk)
-    $(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out 2>&1 && touch -t 200001010000 $(_flags_varmk))
+    $(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out && touch -t 200001010000 $(_flags_varmk))
     $(if $(filter-out 0,$(.SHELLSTATUS)),$(error release-config failed to run))
     ifneq (,$(_final_product_config_pass))
         # Save the final version of the config.