tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "print module name on allowlist errors" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-09-05 23:26:31 +00:00 committed by Gerrit Code Review
commit 922e6adfd2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/bazel.go
View file

@ -533,13 +533,13 @@ func (b *BazelModuleBase) shouldConvertWithBp2build(ctx shouldConvertModuleConte
moduleTypeAllowed := allowlist.moduleTypeAlwaysConvert[p.moduleType] moduleTypeAllowed := allowlist.moduleTypeAlwaysConvert[p.moduleType]
allowlistConvert := moduleNameAllowed || moduleTypeAllowed allowlistConvert := moduleNameAllowed || moduleTypeAllowed
if moduleNameAllowed && moduleTypeAllowed { if moduleNameAllowed && moduleTypeAllowed {
ctx.ModuleErrorf("A module cannot be in moduleAlwaysConvert and also be in moduleTypeAlwaysConvert") ctx.ModuleErrorf("A module %q of type %q cannot be in moduleAlwaysConvert and also be in moduleTypeAlwaysConvert", moduleName, p.moduleType)
return false return false
} }
if allowlist.moduleDoNotConvert[moduleName] { if allowlist.moduleDoNotConvert[moduleName] {
if moduleNameAllowed { if moduleNameAllowed {
ctx.ModuleErrorf("a module cannot be in moduleDoNotConvert and also be in moduleAlwaysConvert") ctx.ModuleErrorf("a module %q cannot be in moduleDoNotConvert and also be in moduleAlwaysConvert", moduleName)
} }
return false return false
} }

4
android/bazel_test.go
View file

@ -252,7 +252,7 @@ func TestBp2BuildAllowlist(t *testing.T) {
{ {
description: "module in name allowlist and type allowlist fails", description: "module in name allowlist and type allowlist fails",
shouldConvert: false, shouldConvert: false,
expectedErrors: []string{"A module cannot be in moduleAlwaysConvert and also be in moduleTypeAlwaysConvert"}, expectedErrors: []string{"A module \"foo\" of type \"rule1\" cannot be in moduleAlwaysConvert and also be in moduleTypeAlwaysConvert"},
module: TestBazelModule{ module: TestBazelModule{
TestModuleInfo: bazel.TestModuleInfo{ TestModuleInfo: bazel.TestModuleInfo{
ModuleName: "foo", ModuleName: "foo",
@ -273,7 +273,7 @@ func TestBp2BuildAllowlist(t *testing.T) {
{ {
description: "module in allowlist and denylist fails", description: "module in allowlist and denylist fails",
shouldConvert: false, shouldConvert: false,
expectedErrors: []string{"a module cannot be in moduleDoNotConvert and also be in moduleAlwaysConvert"}, expectedErrors: []string{"a module \"foo\" cannot be in moduleDoNotConvert and also be in moduleAlwaysConvert"},
module: TestBazelModule{ module: TestBazelModule{
TestModuleInfo: bazel.TestModuleInfo{ TestModuleInfo: bazel.TestModuleInfo{
ModuleName: "foo", ModuleName: "foo",