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

Commit 84c6b13d authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Add handle to enforce_product_packages_exist" am: 76fff5dd am: 993e6006 am: 709e1e93 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2064467



Change-Id: I9ceac3d227b287c4491cdf5f74ab225f18ef1ef1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d067eae5 709e1e93

mk2rbc/mk2rbc.go

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ var knownFunctions = map[string]interface { 
	"copy-files":                           &simpleCallParser{name: baseName + ".copy_files", returnType: starlarkTypeList},

	"dir":                                  &simpleCallParser{name: baseName + ".dir", returnType: starlarkTypeString},

	"dist-for-goals":                       &simpleCallParser{name: baseName + ".mkdist_for_goals", returnType: starlarkTypeVoid, addGlobals: true},

	"enforce-product-packages-exist":       &simpleCallParser{name: baseName + ".enforce_product_packages_exist", returnType: starlarkTypeVoid},

	"enforce-product-packages-exist":       &simpleCallParser{name: baseName + ".enforce_product_packages_exist", returnType: starlarkTypeVoid, addHandle: true},

	"error":                                &makeControlFuncParser{name: baseName + ".mkerror"},

	"findstring":                           &simpleCallParser{name: baseName + ".findstring", returnType: starlarkTypeInt},

	"find-copy-subdir-files":               &simpleCallParser{name: baseName + ".find_and_copy", returnType: starlarkTypeList},
@@ -1241,7 +1241,7 @@ func (ctx *parseContext) maybeParseFunctionCall(node mkparser.Node, ref *mkparse 
		}

		name = words[0].Dump()

		if len(words) < 2 {

			args = &mkparser.MakeString{}

			args = mkparser.SimpleMakeString("", words[0].Pos())

		} else {

			args = words[1]

		}

mk2rbc/mk2rbc_test.go

+2 −2
Original line number Diff line number Diff line
@@ -773,8 +773,8 @@ $(call add-product-dex-preopt-module-config,MyModule,disable) 


def init(g, handle):

  cfg = rblf.cfg(handle)

  rblf.enforce_product_packages_exist("")

  rblf.enforce_product_packages_exist("foo")

  rblf.enforce_product_packages_exist(handle, "")

  rblf.enforce_product_packages_exist(handle, "foo")

  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")