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

Commit 19da477d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add the handle to artifact path requirement functions"

parents a2a7b579 ea9db58d

mk2rbc/mk2rbc.go

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ var knownFunctions = map[string]interface { 
	"my-dir":                               &myDirCallParser{},

	"patsubst":                             &substCallParser{fname: "patsubst"},

	"product-copy-files-by-pattern":        &simpleCallParser{name: baseName + ".product_copy_files_by_pattern", returnType: starlarkTypeList},

	"require-artifacts-in-path":            &simpleCallParser{name: baseName + ".require_artifacts_in_path", returnType: starlarkTypeVoid},

	"require-artifacts-in-path-relaxed":    &simpleCallParser{name: baseName + ".require_artifacts_in_path_relaxed", returnType: starlarkTypeVoid},

	"require-artifacts-in-path":            &simpleCallParser{name: baseName + ".require_artifacts_in_path", returnType: starlarkTypeVoid, addHandle: true},

	"require-artifacts-in-path-relaxed":    &simpleCallParser{name: baseName + ".require_artifacts_in_path_relaxed", returnType: starlarkTypeVoid, addHandle: true},

	// TODO(asmundak): remove it once all calls are removed from configuration makefiles. see b/183161002

	"shell":    &shellCallParser{},

	"sort":     &simpleCallParser{name: baseName + ".mksort", returnType: starlarkTypeList},

mk2rbc/mk2rbc_test.go

+2 −2
Original line number Diff line number Diff line
@@ -775,8 +775,8 @@ def init(g, handle): 
  cfg = rblf.cfg(handle)

  rblf.enforce_product_packages_exist("")

  rblf.enforce_product_packages_exist("foo")

  rblf.require_artifacts_in_path("foo", "bar")

  rblf.require_artifacts_in_path_relaxed("foo", "bar")

  rblf.require_artifacts_in_path(handle, "foo", "bar")

  rblf.require_artifacts_in_path_relaxed(handle, "foo", "bar")

  rblf.mkdist_for_goals(g, "goal", "from:to")

  rblf.add_product_dex_preopt_module_config(handle, "MyModule", "disable")

`,