From 0e2b2568460a5d37e9e88b36f75854005cafe333 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 1 Apr 2022 11:46:50 -0700 Subject: [PATCH] Correct type of dir function It should return a string, not a list. Bug: 227245326 Test: go test Change-Id: If0cb382dede52200c0595ae939a8064641216af1 --- mk2rbc/mk2rbc.go | 2 +- mk2rbc/mk2rbc_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk2rbc/mk2rbc.go b/mk2rbc/mk2rbc.go index c881751d7..950a1e51d 100644 --- a/mk2rbc/mk2rbc.go +++ b/mk2rbc/mk2rbc.go @@ -77,7 +77,7 @@ var knownFunctions = map[string]interface { "addprefix": &simpleCallParser{name: baseName + ".addprefix", returnType: starlarkTypeList}, "addsuffix": &simpleCallParser{name: baseName + ".addsuffix", returnType: starlarkTypeList}, "copy-files": &simpleCallParser{name: baseName + ".copy_files", returnType: starlarkTypeList}, - "dir": &simpleCallParser{name: baseName + ".dir", 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}, "error": &makeControlFuncParser{name: baseName + ".mkerror"}, diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index 31739fa98..2b447e383 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -793,7 +793,7 @@ PRODUCT_COPY_FILES := $(addprefix pfx-,a b c) PRODUCT_COPY_FILES := $(addsuffix .sff, a b c) PRODUCT_NAME := $(word 1, $(subst ., ,$(TARGET_BOARD_PLATFORM))) $(info $(patsubst %.pub,$(PRODUCT_NAME)%,$(PRODUCT_ADB_KEYS))) -$(info $(dir foo/bar)) +$(info $$(dir foo/bar): $(dir foo/bar)) $(info $(firstword $(PRODUCT_COPY_FILES))) $(info $(lastword $(PRODUCT_COPY_FILES))) $(info $(dir $(lastword $(MAKEFILE_LIST)))) @@ -816,7 +816,7 @@ def init(g, handle): cfg["PRODUCT_COPY_FILES"] = rblf.addsuffix(".sff", "a b c") cfg["PRODUCT_NAME"] = ((g.get("TARGET_BOARD_PLATFORM", "")).replace(".", " ")).split()[0] rblf.mkinfo("product.mk", rblf.mkpatsubst("%.pub", "%s%%" % cfg["PRODUCT_NAME"], g.get("PRODUCT_ADB_KEYS", ""))) - rblf.mkinfo("product.mk", rblf.dir("foo/bar")) + rblf.mkinfo("product.mk", "$(dir foo/bar): %s" % rblf.dir("foo/bar")) rblf.mkinfo("product.mk", cfg["PRODUCT_COPY_FILES"][0]) rblf.mkinfo("product.mk", cfg["PRODUCT_COPY_FILES"][-1]) rblf.mkinfo("product.mk", rblf.dir("product.mk"))