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

Commit 5c714e95 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6d am: a48a2935 

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



Change-Id: I4678710787f617a83230ce6fd5f81bfee5e3c016
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 600329f3 a48a2935

core/envsetup.mk

+10 −2
Original line number Diff line number Diff line
@@ -325,9 +325,17 @@ endif 
# instead of the raw variable values, because mk2rbc can't read the

# raw ones.

define dump-variables-rbc

$(file >$(OUT_DIR)/dump-variables-rbc-temp.txt,$(subst $(space),$(newline),$(.VARIABLES)))\

$(eval _dump_variables_rbc_excluded := \

  LOCAL_PATH \

  TOPDIR \

  TRACE_BEGIN_SOONG \

  BOARD_PLAT_PUBLIC_SEPOLICY_DIR \

  BOARD_PLAT_PRIVATE_SEPOLICY_DIR \

  USER \

  SOONG_% \

  PRODUCT_COPY_OUT_%)\

$(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_.*|TRACE_BEGIN_SOONG)$$"),\

$(foreach v, $(shell echo $(filter-out $(_dump_variables_rbc_excluded),$(.VARIABLES)) | tr ' ' '\n' | grep -he "^[A-Z][A-Z0-9_]*$$"),\

$(v) := $(strip $($(v)))$(newline))\

$(foreach ns,$(SOONG_CONFIG_NAMESPACES),\

$(foreach v,$(SOONG_CONFIG_$(ns)),\