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

Commit a32d67dd authored by LaMont Jones's avatar LaMont Jones Committed by Gerrit Code Review
Browse files

Merge "Revert "Avoid re-running kati unnecessarily."" into main

parents 66236c47 dd2f3ec9

core/release_config.mk

+1 −2
Original line number Diff line number Diff line
@@ -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)