From 15d7b0b0a55a6a968beb16d28a64ab60645c214c Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Wed, 27 Sep 2023 09:38:41 -0400 Subject: [PATCH] Fix false positives of go modules in bpbuild-prog Test: b run //build/bazel/scripts/bp2build_progress:bp2build_progress \ -- report -m tradefed Change-Id: I5b9ed1333d61013649056920ffe7110e9786b29e --- bp2build/build_conversion.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bp2build/build_conversion.go b/bp2build/build_conversion.go index ce2a95552..f53588d76 100644 --- a/bp2build/build_conversion.go +++ b/bp2build/build_conversion.go @@ -783,13 +783,13 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers } else if glib, ok := m.(*bootstrap.GoPackage); ok { targets, targetErrs = generateBazelTargetsGoPackage(bpCtx, glib, nameToGoLibMap) errs = append(errs, targetErrs...) - metrics.IncrementRuleClassCount("go_library") - metrics.AddConvertedModule(glib, "go_library", dir) + metrics.IncrementRuleClassCount("bootstrap_go_package") + metrics.AddConvertedModule(glib, "bootstrap_go_package", dir) } else if gbin, ok := m.(*bootstrap.GoBinary); ok { targets, targetErrs = generateBazelTargetsGoBinary(bpCtx, gbin, nameToGoLibMap) errs = append(errs, targetErrs...) - metrics.IncrementRuleClassCount("go_binary") - metrics.AddConvertedModule(gbin, "go_binary", dir) + metrics.IncrementRuleClassCount("blueprint_go_binary") + metrics.AddConvertedModule(gbin, "blueprint_go_binary", dir) } else { metrics.AddUnconvertedModule(m, moduleType, dir, android.UnconvertedReason{ ReasonType: int(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED),