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

Commit b35e5405 authored by LaMont Jones's avatar LaMont Jones
Browse files

Use TARGET_PRODUCT in more tempfile filenames 

This reduces the number of spurious errors that we get from running
multiple invocations of product config (on different TARGET_PRODUCTs) in
parallel.

Bug: None
Test: Manual
Change-Id: I05cde2986c462f37beddd1e8b4d0e861689ee57a
parent d8887da8

core/envsetup.mk

+2 −2
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ $(eval _dump_variables_rbc_excluded := \ 
  TOPDIR \

  TRACE_BEGIN_SOONG \

  USER)

$(file >$(OUT_DIR)/dump-variables-rbc-temp.txt,$(subst $(space),$(newline),$(sort $(filter-out $(_dump_variables_rbc_excluded),$(.VARIABLES)))))

$(file >$(OUT_DIR)/dump-variables-rbc-temp-$(TARGET_PRODUCT).txt,$(subst $(space),$(newline),$(sort $(filter-out $(_dump_variables_rbc_excluded),$(.VARIABLES)))))

$(file >$(1),\

$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-variables-rbc-temp.txt),\

$(foreach v, $(shell grep -he "^[A-Z][A-Z0-9_]*$$" $(OUT_DIR)/dump-variables-rbc-temp-$(TARGET_PRODUCT).txt),\

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

$(foreach ns,$(sort $(SOONG_CONFIG_NAMESPACES)),\

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