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

Improve error message when a required makefile can't be found

Browse Source 
Bug: 193566316
Test: go test
Change-Id: I41a28808c95df76f212980ef1e59047312fe587b
This commit is contained in:
Cole Faust
2021-12-21 16:11:16 -08:00
parent f7ed5343de
commit 7321b0985e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mk2rbc/mk2rbc_test.go
View File

@@ -1049,7 +1049,7 @@ def init(g, handle):
}.get("vendor/%s/cfg.mk" % g["MY_PATH"]) }.get("vendor/%s/cfg.mk" % g["MY_PATH"])
(_varmod, _varmod_init) = _entry if _entry else (None, None) (_varmod, _varmod_init) = _entry if _entry else (None, None)
if not _varmod_init: if not _varmod_init:
rblf.mkerror("cannot") rblf.mkerror("product.mk", "Cannot find %s" % ("vendor/%s/cfg.mk" % g["MY_PATH"]))
rblf.inherit(handle, _varmod, _varmod_init) rblf.inherit(handle, _varmod, _varmod_init)
`, `,
}, },
@@ -1073,7 +1073,7 @@ def init(g, handle):
}.get("%s/cfg.mk" % g["MY_PATH"]) }.get("%s/cfg.mk" % g["MY_PATH"])
(_varmod, _varmod_init) = _entry if _entry else (None, None) (_varmod, _varmod_init) = _entry if _entry else (None, None)
if not _varmod_init: if not _varmod_init:
rblf.mkerror("cannot") rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
rblf.inherit(handle, _varmod, _varmod_init) rblf.inherit(handle, _varmod, _varmod_init)
`, `,
}, },
@@ -1099,7 +1099,7 @@ def init(g, handle):
}.get("%s/cfg.mk" % g["MY_PATH"]) }.get("%s/cfg.mk" % g["MY_PATH"])
(_varmod, _varmod_init) = _entry if _entry else (None, None) (_varmod, _varmod_init) = _entry if _entry else (None, None)
if not _varmod_init: if not _varmod_init:
rblf.mkerror("cannot") rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
rblf.inherit(handle, _varmod, _varmod_init) rblf.inherit(handle, _varmod, _varmod_init)
#RBC# include_top vendor/foo1 #RBC# include_top vendor/foo1
_entry = { _entry = {
@@ -1107,7 +1107,7 @@ def init(g, handle):
}.get("%s/cfg.mk" % g["MY_PATH"]) }.get("%s/cfg.mk" % g["MY_PATH"])
(_varmod, _varmod_init) = _entry if _entry else (None, None) (_varmod, _varmod_init) = _entry if _entry else (None, None)
if not _varmod_init: if not _varmod_init:
rblf.mkerror("cannot") rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))
rblf.inherit(handle, _varmod, _varmod_init) rblf.inherit(handle, _varmod, _varmod_init)
`, `,
}, },

4
mk2rbc/node.go
View File

@@ -110,7 +110,9 @@ func (i inheritedDynamicModule) emitSelect(gctx *generationContext) {
gctx.writef("if not %s:", i.entryName()) gctx.writef("if not %s:", i.entryName())
gctx.indentLevel++ gctx.indentLevel++
gctx.newLine() gctx.newLine()
gctx.write(`rblf.mkerror("cannot")`) gctx.write(`rblf.mkerror("`, gctx.starScript.mkFile, `", "Cannot find %s" % (`)
i.path.emit(gctx)
gctx.write("))")
gctx.indentLevel-- gctx.indentLevel--
} }
} }