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

Convert dist-for-goals.

Browse Source 
Bug: 198496782
Test: internal
Change-Id: I64ae938a5809238c18aca272ba73e4328fcb9efe
This commit is contained in:
Sasha Smundak
2021-11-15 13:01:53 -08:00
parent cd6c3cd868
commit d679785d0d
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mk2rbc/mk2rbc.go
View File

@@ -102,6 +102,7 @@ var knownFunctions = map[string]struct {
"addsuffix": {baseName + ".addsuffix", starlarkTypeList, hiddenArgNone}, "addsuffix": {baseName + ".addsuffix", starlarkTypeList, hiddenArgNone},
"copy-files": {baseName + ".copy_files", starlarkTypeList, hiddenArgNone}, "copy-files": {baseName + ".copy_files", starlarkTypeList, hiddenArgNone},
"dir": {baseName + ".dir", starlarkTypeList, hiddenArgNone}, "dir": {baseName + ".dir", starlarkTypeList, hiddenArgNone},
"dist-for-goals": {baseName + ".mkdist_for_goals", starlarkTypeVoid, hiddenArgGlobal},
"enforce-product-packages-exist": {baseName + ".enforce_product_packages_exist", starlarkTypeVoid, hiddenArgNone}, "enforce-product-packages-exist": {baseName + ".enforce_product_packages_exist", starlarkTypeVoid, hiddenArgNone},
"error": {baseName + ".mkerror", starlarkTypeVoid, hiddenArgNone}, "error": {baseName + ".mkerror", starlarkTypeVoid, hiddenArgNone},
"findstring": {"!findstring", starlarkTypeInt, hiddenArgNone}, "findstring": {"!findstring", starlarkTypeInt, hiddenArgNone},

2
mk2rbc/mk2rbc_test.go
View File

@@ -689,6 +689,7 @@ $(call enforce-product-packages-exist,)
$(call enforce-product-packages-exist, foo) $(call enforce-product-packages-exist, foo)
$(call require-artifacts-in-path, foo, bar) $(call require-artifacts-in-path, foo, bar)
$(call require-artifacts-in-path-relaxed, foo, bar) $(call require-artifacts-in-path-relaxed, foo, bar)
$(call dist-for-goals, goal, from:to)
`, `,
expected: `load("//build/make/core:product_config.rbc", "rblf") expected: `load("//build/make/core:product_config.rbc", "rblf")
@@ -698,6 +699,7 @@ def init(g, handle):
rblf.enforce_product_packages_exist("foo") rblf.enforce_product_packages_exist("foo")
rblf.require_artifacts_in_path("foo", "bar") rblf.require_artifacts_in_path("foo", "bar")
rblf.require_artifacts_in_path_relaxed("foo", "bar") rblf.require_artifacts_in_path_relaxed("foo", "bar")
rblf.mkdist_for_goals(g, "goal", "from:to")
`, `,
}, },
{ {