Merge "Allow variable-prefixed include statements in mk2rbc" (f8a4bb6d) · Commits · e / os / android_build_soong

mk2rbc/mk2rbc.go

+14 −12

Original line number	Diff line number	Diff line
		@@ -829,11 +829,7 @@ func (ctx *parseContext) handleSubConfig(
		pathPattern = append(pathPattern, chunk)
		}
		}
		if pathPattern[0] == "" {
		if len(ctx.includeTops) == 0 {
		ctx.errorf(v, "inherit-product/include statements must not be prefixed with a variable, or must include a #RBC# include_top comment beforehand giving a root directory to search.")
		return
		}
		if pathPattern[0] == "" && len(ctx.includeTops) > 0 {
		// If pattern starts from the top. restrict it to the directories where
		// we know inherit-product uses dynamically calculated path.
		for _, p := range ctx.includeTops {
		@@ -849,7 +845,12 @@ func (ctx *parseContext) handleSubConfig(
		ctx.errorf(v, "there are >%d files matching the pattern, please rewrite it", maxMatchingFiles)
		return
		}
		res := inheritedDynamicModule{varPath, []moduleInfo{}, loadAlways}
		if len(matchingPaths) == 1 {
		res := inheritedStaticModule{ctx.newDependentModule(matchingPaths[0], loadAlways && ctx.ifNestLevel == 0), loadAlways}
		processModule(res)
		} else {
		needsWarning := pathPattern[0] == "" && len(ctx.includeTops) == 0
		res := inheritedDynamicModule{varPath, []moduleInfo{}, loadAlways, ctx.errorLocation(v), needsWarning}
		for _, p := range matchingPaths {
		// A product configuration files discovered dynamically may attempt to inherit
		// from another one which does not exist in this source tree. Prevent load errors
		@@ -858,6 +859,7 @@ func (ctx *parseContext) handleSubConfig(
		}
		processModule(res)
		}
		}

		func (ctx *parseContext) findMatchingPaths(pattern []string) []string {
		files := ctx.script.makefileFinder.Find(ctx.script.topDir)

mk2rbc/mk2rbc_test.go

+9 −30

Original line number	Diff line number	Diff line
		@@ -1072,13 +1072,7 @@ def init(g, handle):
		cfg = rblf.cfg(handle)
		g["MY_PATH"] = "foo"
		#RBC# include_top vendor/foo1
		_entry = {
		"vendor/foo1/cfg.mk": ("vendor/foo1/cfg", _cfg_init),
		}.get("%s/cfg.mk" % g["MY_PATH"])
		(_varmod, _varmod_init) = _entry if _entry else (None, None)
		if not _varmod_init:
		rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
		rblf.inherit(handle, _varmod, _varmod_init)
		rblf.inherit(handle, "vendor/foo1/cfg", _cfg_init)
		`,
		},
		{
		@@ -1098,25 +1092,13 @@ def init(g, handle):
		cfg = rblf.cfg(handle)
		g["MY_PATH"] = "foo"
		#RBC# include_top vendor/foo1
		_entry = {
		"vendor/foo1/cfg.mk": ("vendor/foo1/cfg", _cfg_init),
		}.get("%s/cfg.mk" % g["MY_PATH"])
		(_varmod, _varmod_init) = _entry if _entry else (None, None)
		if not _varmod_init:
		rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
		rblf.inherit(handle, _varmod, _varmod_init)
		rblf.inherit(handle, "vendor/foo1/cfg", _cfg_init)
		#RBC# include_top vendor/foo1
		_entry = {
		"vendor/foo1/cfg.mk": ("vendor/foo1/cfg", _cfg_init),
		}.get("%s/cfg.mk" % g["MY_PATH"])
		(_varmod, _varmod_init) = _entry if _entry else (None, None)
		if not _varmod_init:
		rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
		rblf.inherit(handle, _varmod, _varmod_init)
		rblf.inherit(handle, "vendor/foo1/cfg", _cfg_init)
		`,
		},
		{
		desc: "Dynamic inherit path that lacks necessary hint",
		desc: "Dynamic inherit path that lacks hint",
		mkname: "product.mk",
		in: `
		#RBC# include_top foo
		@@ -1133,26 +1115,23 @@ $(call inherit-product,$(MY_VAR)/font.mk)
		expected: `#RBC# include_top foo
		load("//build/make/core:product_config.rbc", "rblf")
		load("//foo:font.star\|init", _font_init = "init")
		load("//bar:font.star\|init", _font1_init = "init")

		def init(g, handle):
		cfg = rblf.cfg(handle)
		_entry = {
		"foo/font.mk": ("foo/font", _font_init),
		}.get("%s/font.mk" % g.get("MY_VAR", ""))
		(_varmod, _varmod_init) = _entry if _entry else (None, None)
		if not _varmod_init:
		rblf.mkerror("product.mk", "Cannot find %s" % ("%s/font.mk" % g.get("MY_VAR", "")))
		rblf.inherit(handle, _varmod, _varmod_init)
		rblf.inherit(handle, "foo/font", _font_init)
		#RBC# include_top foo
		# There's some space and even this comment between the include_top and the inherit-product
		rblf.inherit(handle, "foo/font", _font_init)
		rblf.mkwarning("product.mk:11", "Including a path with a non-constant prefix, please convert this to a simple literal to generate cleaner starlark.")
		_entry = {
		"foo/font.mk": ("foo/font", _font_init),
		"bar/font.mk": ("bar/font", _font1_init),
		}.get("%s/font.mk" % g.get("MY_VAR", ""))
		(_varmod, _varmod_init) = _entry if _entry else (None, None)
		if not _varmod_init:
		rblf.mkerror("product.mk", "Cannot find %s" % ("%s/font.mk" % g.get("MY_VAR", "")))
		rblf.inherit(handle, _varmod, _varmod_init)
		rblf.mk2rbc_error("product.mk:11", "inherit-product/include statements must not be prefixed with a variable, or must include a #RBC# include_top comment beforehand giving a root directory to search.")
		`,
		},
		{

mk2rbc/node.go

+6 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ type inheritedDynamicModule struct {
		path interpolateExpr
		candidateModules []*moduleInfo
		loadAlways bool
		location ErrorLocation
		needsWarning bool
		}

		func (i inheritedDynamicModule) name() string {
		@@ -97,6 +99,10 @@ func (i inheritedDynamicModule) entryName() string {
		}

		func (i inheritedDynamicModule) emitSelect(gctx *generationContext) {
		if i.needsWarning {
		gctx.newLine()
		gctx.writef("%s.mkwarning(%q, %q)", baseName, i.location, "Including a path with a non-constant prefix, please convert this to a simple literal to generate cleaner starlark.")
		}
		gctx.newLine()
		gctx.writef("_entry = {")
		gctx.indentLevel++