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

Commit b3c3d9a2 authored by Jingwen Chen's avatar Jingwen Chen Committed by Gerrit Code Review
Browse files

Merge "Fix bp2build-progress generating an empty converted_modules list, and... 

Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names."
parents e992a52d afb84bd7

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)