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

Better Soong namespace support in the RBC runtime.

Browse Source 
Includes:
* Defining namespace again should have no effect
* Allow appending to a variable defined in a namespace
* Consistent naming
* Print namespace variable assignments even if they are empty

Bug: 200297238
Test: rbcrun make/build/tests/run.rbc
Change-Id: I64aa22c4498ae89e4bc3a077d6206ad37d5c7c38
This commit is contained in:
Sasha Smundak
2021-09-17 15:27:37 -07:00
parent da2f56ebe4
commit dc154164db
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/device.rbc
View File

@@ -23,12 +23,11 @@
### PRODUCT_PACKAGES += dev_after
### PRODUCT_COPY_FILES += $(call find-copy-subdir-files,audio_platform_info*.xml,device/google/redfin/audio,$(TARGET_COPY_OUT_VENDOR)/etc) xyz:/etc/xyz
### PRODUCT_COPY_FILES += $(call copy-files,x.xml y.xml,/etc)
### $(call add_soong_namespace,NS1)
### $(call add_soong_config_var_value,NS1,v1,abc)
### $(call add_soong_config_var_value,NS1,v2,def)
### $(call add_soong_namespace,NS2)
### $(call add_soong_config_namespace,NS1)
### $(call soong_config_append,NS1,v1,abc)
### $(call soong_config_append,NS1,v2,def)
### $(call add_soong_config_var_value,NS2,v3,abc)
### $(call add_soong_config_var_value,NS2,v3,xyz)
### $(call soong_config_set,NS2,v3,xyz)
load("//build/make/core:product_config.rbc", "rblf")
load(":part1.rbc", _part1_init = "init")
@@ -50,10 +49,9 @@ def init(g, handle):
cfg["PRODUCT_COPY_FILES"] += rblf.copy_files("x.xml y.xml", "/etc")
cfg["PRODUCT_COPY_FILES"] += rblf.copy_files(["from/sub/x", "from/sub/y"], "to")
rblf.add_soong_config_namespace(g, "NS1")
rblf.add_soong_config_var_value(g, "NS1", "v1", "abc")
rblf.add_soong_config_var_value(g, "NS1", "v2", "def")
rblf.add_soong_config_namespace(g, "NS2")
rblf.add_soong_config_var_value(g, "NS2", "v3", "abc")
rblf.add_soong_config_var_value(g, "NS2", "v3", "xyz")
rblf.soong_config_namespace(g, "NS1")
rblf.soong_config_append(g, "NS1", "v1", "abc")
rblf.soong_config_append(g, "NS1", "v2", "def")
rblf.soong_config_set(g, "NS2", "v3", "abc")
rblf.soong_config_set(g, "NS2", "v3", "xyz")

2
tests/part1.rbc
View File

@@ -26,3 +26,5 @@ def init(g, handle):
cfg["PRODUCT_COPY_FILES"] += ["part_from:part_to"]
rblf.setdefault(handle, "PRODUCT_PRODUCT_PROPERTIES")
cfg["PRODUCT_PRODUCT_PROPERTIES"] += ["part_properties"]
rblf.soong_config_namespace(g, "NS1")
rblf.soong_config_append(g, "NS1", "v1", "abc_part1")

2
tests/run.rbc
View File

@@ -80,7 +80,7 @@ ns = globals["$SOONG_CONFIG_NAMESPACES"]
assert_eq(
{
"NS1": {
"v1": "abc",
"v1": "abc abc_part1",
"v2": "def"
},
"NS2": {