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

Commit 5d5fcc30 authored by Cole Faust's avatar Cole Faust
Browse files

Ignore assignments to .KATI_READONLY 

Since the rbc results file is sorted, .KATI_READONLY
ends up trying to make a variable that hasn't been defined
yet readonly, which is an error.

It's not really worth supporting moving it down in the list,
because it wouldn't affect the variable being writable while
still in Starlark code.

Bug: 226974242
Test: go test
Change-Id: I9402f69be97e5c7cf010ad86f124422ea55fda7f
parent 12097e31

mk2rbc/mk2rbc.go

+6 −0
Original line number Diff line number Diff line
@@ -542,6 +542,12 @@ func (ctx *parseContext) handleAssignment(a *mkparser.Assignment) []starlarkNode 
	if strings.HasPrefix(name, "override ") {

		return []starlarkNode{ctx.newBadNode(a, "cannot handle override directive")}

	}

	if name == ".KATI_READONLY" {

		// Skip assignments to .KATI_READONLY. If it was in the output file, it

		// would be an error because it would be sorted before the definition of

		// the variable it's trying to make readonly.

		return []starlarkNode{}

	}



	// Soong configuration

	if strings.HasPrefix(name, soongNsPrefix) {

mk2rbc/mk2rbc_test.go

+14 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,20 @@ def init(g, handle): 
    cfg["PRODUCT_COPY_FILES"] += ("foo/bar/%s:%s/etc/%s" % (x, g.get("TARGET_COPY_OUT_VENDOR", ""), x)).split()

    if g.get("MY_OTHER_VAR", ""):

      cfg["PRODUCT_COPY_FILES"] += ("%s:foo/bar/%s" % (g.get("MY_OTHER_VAR", ""), x)).split()

`,

	},

	{

		desc:   ".KATI_READONLY",

		mkname: "product.mk",

		in: `

MY_VAR := foo

.KATI_READONLY := MY_VAR

`,

		expected: `load("//build/make/core:product_config.rbc", "rblf")



def init(g, handle):

  cfg = rblf.cfg(handle)

  g["MY_VAR"] = "foo"

`,

	},

}