From 6c41b8a729fac9a8f64a026b1a9d4e54447519a1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 13 Apr 2022 13:53:48 -0700 Subject: [PATCH] Add handle to enforce_product_packages_exist Bug: 229132189 Test: go test Change-Id: I76804354051f0866c8cad48c1189b36de4f73e23 --- mk2rbc/mk2rbc.go | 4 ++-- mk2rbc/mk2rbc_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mk2rbc/mk2rbc.go b/mk2rbc/mk2rbc.go index df18243f7..51859e0d8 100644 --- a/mk2rbc/mk2rbc.go +++ b/mk2rbc/mk2rbc.go @@ -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] } diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index 96132ccb2..8cd3937e2 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -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")