From afb84bd78f39ca8f43f4eaeacfc942f319ad4376 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Mon, 20 Sep 2021 10:31:46 +0000 Subject: [PATCH] Fix bp2build-progress generating an empty converted_modules list, and duplicate module names. We were using the value receiver on AddConvertedModule before, which didn't actually mutate the internal slice state. Test: Run bp2build-progress.py Change-Id: Ic60f8f6214a91dc129abf62c57dd0b85efffb283 --- bp2build/build_conversion.go | 3 +-- bp2build/metrics.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bp2build/build_conversion.go b/bp2build/build_conversion.go index f7b392b04..07f492efb 100644 --- a/bp2build/build_conversion.go +++ b/bp2build/build_conversion.go @@ -308,9 +308,8 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers } } targets = generateBazelTargets(bpCtx, aModule) + metrics.AddConvertedModule(m.Name()) for _, t := range targets { - // only add targets that exist in Soong to compatibility layer - metrics.AddConvertedModule(m.Name()) metrics.RuleClassCount[t.ruleClass] += 1 } } else { diff --git a/bp2build/metrics.go b/bp2build/metrics.go index 55b928b70..9e7b3b641 100644 --- a/bp2build/metrics.go +++ b/bp2build/metrics.go @@ -24,7 +24,7 @@ type CodegenMetrics struct { } // Print the codegen metrics to stdout. -func (metrics CodegenMetrics) Print() { +func (metrics *CodegenMetrics) Print() { generatedTargetCount := 0 for _, ruleClass := range android.SortedStringKeys(metrics.RuleClassCount) { count := metrics.RuleClassCount[ruleClass] @@ -40,7 +40,7 @@ func (metrics CodegenMetrics) Print() { strings.Join(metrics.moduleWithUnconvertedDepsMsgs, "\n\t")) } -func (metrics CodegenMetrics) AddConvertedModule(moduleName string) { +func (metrics *CodegenMetrics) AddConvertedModule(moduleName string) { // Undo prebuilt_ module name prefix modifications moduleName = android.RemoveOptionalPrebuiltPrefix(moduleName) metrics.convertedModules = append(metrics.convertedModules, moduleName)