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

Commit a1b215cf authored by Cole Faust's avatar Cole Faust
Browse files

Remove leading whitespace from dump-variables-rbc results 

For some reason, some internal products were failing the
quick rbc ci check purely because of indentation differences
in the variable dump file. That file has a lot of wonky
leading indentation due to the foreaches and line breaks
in the function implementation that I couldn't figure
out how to remove. Instead, use a sed command to remove
leading spaces after writing the file.

Bug: 239453560
Test: build/bazel/ci/rbc_dashboard.py --quick on a new internal-only product
Change-Id: I4b34d8e0b5dbbfcbb9ed35345d216ca11a5a1198
parent e8b97242

core/envsetup.mk

+4 −1
Original line number Diff line number Diff line
@@ -323,7 +323,9 @@ endif 
# likely to be relevant to the product or board configuration.

# Soong config variables are dumped as $(call soong_config_set) calls

# 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

$(eval _dump_variables_rbc_excluded := \

  BUILD_NUMBER \
@@ -345,6 +347,7 @@ $(v) := $(strip $($(v)))$(newline))\ 
$(foreach ns,$(sort $(SOONG_CONFIG_NAMESPACES)),\

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

$$(call soong_config_set,$(ns),$(v),$(SOONG_CONFIG_$(ns)_$(v)))$(newline))))

$(shell sed -i "s/^ *//g" $(1))

endef



# Read the product specs so we can get TARGET_DEVICE and other