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

Commit 0be10758 authored by LaMont Jones's avatar LaMont Jones Committed by Android (Google) Code Review
Browse files

Revert "Always re-run release-config during kati." 

This reverts commit 3c0cf46a.

Reason for revert: b/432018125

Bug: b/432018125
Change-Id: I59d0614c7b0506c212043050f035f847ffeefabb
parent 3c0cf46a

core/release_config.mk

+1 −2
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ _flags_varmk:=$(_flags_file:.vars=.varmk) 
# Note: The lack of $(KATI_extra_file_deps) is intentional.  Since only the final build flag values for

# *THIS* release config matter for analysis, we don't need to re-run Kati if there were input changes

# that did not cause any changes in the final state of this release config.

# TODO(b/432018125): Verify if re-running fixes the bug before switching this back to KATI_shell_no_rerun.

$(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.${TARGET_PRODUCT}.out && touch -t 200001010000 $(_flags_varmk))

$(KATI_shell_no_rerun $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.${TARGET_PRODUCT}.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.