StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove leading whitespace from dump-variables-rbc results" am: 1fabb2a942 am: b102b987a5 am: f5ba9b76f6 am: be13f0b231

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2162942

Change-Id: I2a267eb5c347215143f8c9740f338327300e2b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-08-01 18:41:31 +00:00
committed by Automerger Merge Worker
parent 771c7a4165 be13f0b231
commit ac441430dc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/envsetup.mk
View File

@@ -323,7 +323,9 @@ endif
# likely to be relevant to the product or board configuration. # likely to be relevant to the product or board configuration.
# Soong config variables are dumped as $(call soong_config_set) calls # Soong config variables are dumped as $(call soong_config_set) calls
# instead of the raw variable values, because mk2rbc can't read the # instead of the raw variable values, because mk2rbc can't read the
# raw ones. # raw ones. There is a final sed command on the output file to
# remove leading spaces because I couldn't figure out how to remove
# them in pure make code.
define dump-variables-rbc define dump-variables-rbc
$(eval _dump_variables_rbc_excluded := \ $(eval _dump_variables_rbc_excluded := \
BUILD_NUMBER \ BUILD_NUMBER \
@@ -345,6 +347,7 @@ $(v) := $(strip $($(v)))$(newline))\
$(foreach ns,$(sort $(SOONG_CONFIG_NAMESPACES)),\ $(foreach ns,$(sort $(SOONG_CONFIG_NAMESPACES)),\
$(foreach v,$(sort $(SOONG_CONFIG_$(ns))),\ $(foreach v,$(sort $(SOONG_CONFIG_$(ns))),\
$$(call soong_config_set,$(ns),$(v),$(SOONG_CONFIG_$(ns)_$(v)))$(newline)))) $$(call soong_config_set,$(ns),$(v),$(SOONG_CONFIG_$(ns)_$(v)))$(newline))))
$(shell sed -i "s/^ *//g" $(1))
endef endef
# Read the product specs so we can get TARGET_DEVICE and other # Read the product specs so we can get TARGET_DEVICE and other