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

Merge "Fix false positives of go modules in bpbuild-prog" into main am: aaf91a48e9 am: ab601f2df9 am: f81c892811 am: 2e67c5f090

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

Change-Id: I24ed4bb07f6a53a158930c8084b58742c1c6110f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-27 21:39:09 +00:00
committed by Automerger Merge Worker
parent dd26735190 2e67c5f090
commit f7301340b6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bp2build/build_conversion.go
View File

@@ -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),