Merge "Show module's type and path when reporting dependency problems" (39291b96) · Commits · e / os / android_build_soong

bp2build/build_conversion.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -320,7 +320,8 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers

		// Handle modules with unconverted deps. By default, emit a warning.
		if unconvertedDeps := aModule.GetUnconvertedBp2buildDeps(); len(unconvertedDeps) > 0 {
		msg := fmt.Sprintf("%q depends on unconverted modules: %s", m.Name(), strings.Join(unconvertedDeps, ", "))
		msg := fmt.Sprintf("%s %s:%s depends on unconverted modules: %s",
		moduleType, bpCtx.ModuleDir(m), m.Name(), strings.Join(unconvertedDeps, ", "))
		if ctx.unconvertedDepMode == warnUnconvertedDeps {
		metrics.moduleWithUnconvertedDepsMsgs = append(metrics.moduleWithUnconvertedDepsMsgs, msg)
		} else if ctx.unconvertedDepMode == errorModulesUnconvertedDeps {
		@@ -329,7 +330,8 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers
		}
		}
		if unconvertedDeps := aModule.GetMissingBp2buildDeps(); len(unconvertedDeps) > 0 {
		msg := fmt.Sprintf("%q depends on missing modules: %s", m.Name(), strings.Join(unconvertedDeps, ", "))
		msg := fmt.Sprintf("%s %s:%s depends on missing modules: %s",
		moduleType, bpCtx.ModuleDir(m), m.Name(), strings.Join(unconvertedDeps, ", "))
		if ctx.unconvertedDepMode == warnUnconvertedDeps {
		metrics.moduleWithMissingDepsMsgs = append(metrics.moduleWithMissingDepsMsgs, msg)
		} else if ctx.unconvertedDepMode == errorModulesUnconvertedDeps {

+1 −1

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,7 @@ func TestModuleTypeBp2Build(t *testing.T) {
		],
		bazel_module: { bp2build_available: true },
		}`,
		ExpectedErr: fmt.Errorf(`"foobar" depends on unconverted modules: foo`),
		ExpectedErr: fmt.Errorf(`filegroup .:foobar depends on unconverted modules: foo`),
		Filesystem: map[string]string{
		"other/Android.bp": `filegroup {
		name: "foo",