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

Commit 3cb45a5f authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Update warning message"

parents 26cb965d f4e72cf6

mk2rbc/mk2rbc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ def init(g, handle): 
  rblf.inherit(handle, "foo/font", _font_init)

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

  rblf.mkwarning("product.mk:11", "Please avoid starting an include path with a variable. See https://source.android.com/setup/build/bazel/product_config/issues/includes for details.")

  _entry = {

    "foo/font.mk": ("foo/font", _font_init),

    "bar/font.mk": ("bar/font", _font1_init),

mk2rbc/node.go

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 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. See https://source.android.com/setup/build/bazel/product_config/issues/includes for details.")

		gctx.writef("%s.mkwarning(%q, %q)", baseName, i.location, "Please avoid starting an include path with a variable. See https://source.android.com/setup/build/bazel/product_config/issues/includes for details.")

	}

	gctx.newLine()

	gctx.writef("_entry = {")