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

Commit afb84bd7 authored Sep 20, 2021 by Jingwen Chen

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

parent 0c7ca978

bp2build/build_conversion.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -308,9 +308,8 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers
		}
		}
		targets = generateBazelTargets(bpCtx, aModule)
		for _, t := range targets {
		// only add targets that exist in Soong to compatibility layer
		metrics.AddConvertedModule(m.Name())
		for _, t := range targets {
		metrics.RuleClassCount[t.ruleClass] += 1
		}
		} else {

bp2build/metrics.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)