StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update warning message" am: 3cb45a5f4a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976990

Change-Id: I2133f0ec5c15135a3fa33be0a76e7d28ebad4049
This commit is contained in:
Cole Faust
2022-02-10 02:29:08 +00:00
committed by Automerger Merge Worker
parent af351356ed 3cb45a5f4a
commit 3d07523121
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk2rbc/mk2rbc_test.go
View File

@@ -1119,7 +1119,7 @@ def init(g, handle):
rblf.inherit(handle, "foo/font", _font_init) rblf.inherit(handle, "foo/font", _font_init)
# There's some space and even this comment between the include_top and the inherit-product # There's some space and even this comment between the include_top and the inherit-product
rblf.inherit(handle, "foo/font", _font_init) 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 = { _entry = {
"foo/font.mk": ("foo/font", _font_init), "foo/font.mk": ("foo/font", _font_init),
"bar/font.mk": ("bar/font", _font1_init), "bar/font.mk": ("bar/font", _font1_init),

2
mk2rbc/node.go
View File

@@ -101,7 +101,7 @@ func (i inheritedDynamicModule) entryName() string {
func (i inheritedDynamicModule) emitSelect(gctx *generationContext) { func (i inheritedDynamicModule) emitSelect(gctx *generationContext) {
if i.needsWarning { if i.needsWarning {
gctx.newLine() 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.newLine()
gctx.writef("_entry = {") gctx.writef("_entry = {")