Merge "Fix RBC incremental builds" am: ff84a2b45d

Original change: https://android-review.googlesource.com/c/platform/build/+/1961825

Change-Id: Ib71ea1f2d234be7285816796f66072e43a26463b
This commit is contained in:
Treehugger Robot
2022-01-27 20:34:59 +00:00
committed by Automerger Merge Worker

View File

@@ -324,7 +324,7 @@ endif
define dump-variables-rbc define dump-variables-rbc
$(file >$(OUT_DIR)/dump-variables-rbc-temp.txt,$(subst $(space),$(newline),$(.VARIABLES)))\ $(file >$(OUT_DIR)/dump-variables-rbc-temp.txt,$(subst $(space),$(newline),$(.VARIABLES)))\
$(file >$(1),\ $(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))\ $(v) := $(strip $($(v)))$(newline))\
$(foreach ns,$(SOONG_CONFIG_NAMESPACES),\ $(foreach ns,$(SOONG_CONFIG_NAMESPACES),\
$(foreach v,$(SOONG_CONFIG_$(ns)),\ $(foreach v,$(SOONG_CONFIG_$(ns)),\