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

Commit 2d2df8cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert $(call soong_config_set_bool) to rbc" into main

parents ff545cae 5914aae7

mk2rbc/mk2rbc.go

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ var knownFunctions = map[string]interface { 
	"add_soong_config_namespace":           &simpleCallParser{name: baseName + ".soong_config_namespace", returnType: starlarkTypeVoid, addGlobals: true},

	"add_soong_config_var_value":           &simpleCallParser{name: baseName + ".soong_config_set", returnType: starlarkTypeVoid, addGlobals: true},

	soongConfigAssign:                      &simpleCallParser{name: baseName + ".soong_config_set", returnType: starlarkTypeVoid, addGlobals: true},

	"soong_config_set_bool":                &simpleCallParser{name: baseName + ".soong_config_set_bool", returnType: starlarkTypeVoid, addGlobals: true},

	soongConfigAppend:                      &simpleCallParser{name: baseName + ".soong_config_append", returnType: starlarkTypeVoid, addGlobals: true},

	"soong_config_get":                     &simpleCallParser{name: baseName + ".soong_config_get", returnType: starlarkTypeString, addGlobals: true},

	"add-to-product-copy-files-if-exists":  &simpleCallParser{name: baseName + ".copy_if_exists", returnType: starlarkTypeList},

mk2rbc/mk2rbc_test.go

+2 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ $(info $(notdir foo/bar)) 
$(call add_soong_config_namespace,snsconfig)

$(call add_soong_config_var_value,snsconfig,imagetype,odm_image)

$(call soong_config_set, snsconfig, foo, foo_value)

$(call soong_config_set_bool, snsconfig, bar, true)

$(call soong_config_append, snsconfig, bar, bar_value)

PRODUCT_COPY_FILES := $(call copy-files,$(wildcard foo*.mk),etc)

PRODUCT_COPY_FILES := $(call product-copy-files-by-pattern,from/%,to/%,a b c)
@@ -880,6 +881,7 @@ def init(g, handle): 
  rblf.soong_config_namespace(g, "snsconfig")

  rblf.soong_config_set(g, "snsconfig", "imagetype", "odm_image")

  rblf.soong_config_set(g, "snsconfig", "foo", "foo_value")

  rblf.soong_config_set_bool(g, "snsconfig", "bar", "true")

  rblf.soong_config_append(g, "snsconfig", "bar", "bar_value")

  cfg["PRODUCT_COPY_FILES"] = rblf.copy_files(rblf.expand_wildcard("foo*.mk"), "etc")

  cfg["PRODUCT_COPY_FILES"] = rblf.product_copy_files_by_pattern("from/%", "to/%", "a b c")