commit 2694a33cb6d19dc302552dc0f46c5120294ed363
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 24 20:48:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 24 20:48:28 2021 +0000
tree 14ccabdd5382c10f7c9c1900ea350dde5ee6b952
parent 1ec033c13251352b8f4b2544afad0a6473ed306f
parent 359665674fece57939282a45f9259f85455509a6

Merge "Exclude predefined variables from board config" am: 359665674f

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

Change-Id: If9850339861ea48042a2c397294303430efac819

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 120f511..15a9944 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -191,7 +191,7 @@
 define dump-public-variables
 $(file >$(OUT_DIR)/dump-public-variables-temp.txt,$(subst $(space),$(newline),$(.VARIABLES)))\
 $(file >$(1),\
-$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-public-variables-temp.txt | grep -vhe "^SOONG_"),\
+$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-public-variables-temp.txt | grep -vhE "^(SOONG_.*|LOCAL_PATH|TOPDIR|PRODUCT_COPY_OUT_.*)$$"),\
 $(v) := $(strip $($(v)))$(newline)))
 endef