StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names." am: b3c3d9a2d5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831633

Change-Id: Ib004dcae1f80d6aa98f53c5be24d5c8790bc7b4f
This commit is contained in:
Jingwen Chen
2021-09-21 00:37:48 +00:00
committed by Automerger Merge Worker
parent 2fa15f76a3 b3c3d9a2d5
commit f02ef5707a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bp2build/build_conversion.go
View File

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

4
bp2build/metrics.go
View File

@@ -24,7 +24,7 @@ type CodegenMetrics struct {
} }
// Print the codegen metrics to stdout. // Print the codegen metrics to stdout.
func (metrics CodegenMetrics) Print() { func (metrics *CodegenMetrics) Print() {
generatedTargetCount := 0 generatedTargetCount := 0
for _, ruleClass := range android.SortedStringKeys(metrics.RuleClassCount) { for _, ruleClass := range android.SortedStringKeys(metrics.RuleClassCount) {
count := metrics.RuleClassCount[ruleClass] count := metrics.RuleClassCount[ruleClass]
@@ -40,7 +40,7 @@ func (metrics CodegenMetrics) Print() {
strings.Join(metrics.moduleWithUnconvertedDepsMsgs, "\n\t")) strings.Join(metrics.moduleWithUnconvertedDepsMsgs, "\n\t"))
} }
func (metrics CodegenMetrics) AddConvertedModule(moduleName string) { func (metrics *CodegenMetrics) AddConvertedModule(moduleName string) {
// Undo prebuilt_ module name prefix modifications // Undo prebuilt_ module name prefix modifications
moduleName = android.RemoveOptionalPrebuiltPrefix(moduleName) moduleName = android.RemoveOptionalPrebuiltPrefix(moduleName)
metrics.convertedModules = append(metrics.convertedModules, moduleName) metrics.convertedModules = append(metrics.convertedModules, moduleName)