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

Commit 922e6adf authored Sep 05, 2023 by Treehugger Robot Committed by Gerrit Code Review Sep 05, 2023

Merge "print module name on allowlist errors" into main

parents eb02c5cb e42edc36

android/bazel.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -533,13 +533,13 @@ func (b *BazelModuleBase) shouldConvertWithBp2build(ctx shouldConvertModuleConte
		moduleTypeAllowed := allowlist.moduleTypeAlwaysConvert[p.moduleType]
		allowlistConvert := 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
		}

		if allowlist.moduleDoNotConvert[moduleName] {
		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
		}

android/bazel_test.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ func TestBp2BuildAllowlist(t *testing.T) {
		{
		description: "module in name allowlist and type allowlist fails",
		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{
		TestModuleInfo: bazel.TestModuleInfo{
		ModuleName: "foo",
		@@ -273,7 +273,7 @@ func TestBp2BuildAllowlist(t *testing.T) {
		{
		description: "module in allowlist and denylist fails",
		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{
		TestModuleInfo: bazel.TestModuleInfo{
		ModuleName: "foo",