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

Commit e42edc36 authored by Sam Delmerico's avatar Sam Delmerico
Browse files

print module name on allowlist errors 

Change-Id: I34db128d96f8121fed56588a5d6ba7de6e848c9a
parent 8d7f2e41

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",