diff options
| -rw-r--r-- | android/bazel.go | 4 | ||||
| -rw-r--r-- | android/bazel_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/bazel.go b/android/bazel.go index eb6aca4e9..1c69c0e6a 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -443,8 +443,8 @@ func (b *BazelModuleBase) shouldConvertWithBp2build(ctx bazelOtherModuleContext, if ok, directoryPath := bp2buildDefaultTrueRecursively(packagePath, allowlist.defaultConfig); ok { if moduleNameAllowed { ctx.ModuleErrorf("A module cannot be in a directory marked Bp2BuildDefaultTrue"+ - " or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: '%s'", - directoryPath) + " or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: '%s'"+ + " Module: '%s'", directoryPath, moduleName) return false } diff --git a/android/bazel_test.go b/android/bazel_test.go index b578cca04..dbe6067f2 100644 --- a/android/bazel_test.go +++ b/android/bazel_test.go @@ -266,7 +266,7 @@ func TestBp2BuildAllowlist(t *testing.T) { { description: "module allowlist and enabled directory", shouldConvert: false, - expectedErrors: []string{"A module cannot be in a directory marked Bp2BuildDefaultTrue or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: 'existing/build/dir'"}, + expectedErrors: []string{"A module cannot be in a directory marked Bp2BuildDefaultTrue or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: 'existing/build/dir' Module: 'foo'"}, module: TestBazelModule{ TestModuleInfo: bazel.TestModuleInfo{ ModuleName: "foo", @@ -287,7 +287,7 @@ func TestBp2BuildAllowlist(t *testing.T) { { description: "module allowlist and enabled subdirectory", shouldConvert: false, - expectedErrors: []string{"A module cannot be in a directory marked Bp2BuildDefaultTrue or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: 'existing/build/dir'"}, + expectedErrors: []string{"A module cannot be in a directory marked Bp2BuildDefaultTrue or Bp2BuildDefaultTrueRecursively and also be in moduleAlwaysConvert. Directory: 'existing/build/dir' Module: 'foo'"}, module: TestBazelModule{ TestModuleInfo: bazel.TestModuleInfo{ ModuleName: "foo", |