From 10105b8157d7055cb34276c28295316493f65576 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 26 Jan 2022 14:50:09 -0800 Subject: [PATCH] Fix RBC incremental builds Kati regenerates its ninja file if an environment variable that was referenced by the makefiles was changed since the last run. TRACE_BEGIN_SOONG is a constantly changing variable that was referenced by dump-variables-rbc, which references all all-caps variables, with a few exceptions. Add TRACE_BEGIN_SOONG to that exception list so kati doesn't rerun every time. Fixes: 216531048 Test: Manually Change-Id: I2df65b6f6aa968f132380e3410763d907d9e3e0f --- core/envsetup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 823290777d..74a9e27a62 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -323,7 +323,7 @@ endif define dump-variables-rbc $(file >$(OUT_DIR)/dump-variables-rbc-temp.txt,$(subst $(space),$(newline),$(.VARIABLES)))\ $(file >$(1),\ -$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-variables-rbc-temp.txt | grep -vhE "^(SOONG_.*|LOCAL_PATH|TOPDIR|PRODUCT_COPY_OUT_.*)$$"),\ +$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-variables-rbc-temp.txt | grep -vhE "^(SOONG_.*|LOCAL_PATH|TOPDIR|PRODUCT_COPY_OUT_.*|TRACE_BEGIN_SOONG)$$"),\ $(v) := $(strip $($(v)))$(newline))\ $(foreach ns,$(SOONG_CONFIG_NAMESPACES),\ $(foreach v,$(SOONG_CONFIG_$(ns)),\