Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22135a0b authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

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

parents 802de330 50dc47d1

core/release_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ ifneq (,$(_use_protobuf)) 
    _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.