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

Commit 64852423 authored by Spandan Das's avatar Spandan Das
Browse files

Special-case go modules in convertedToBazel 

This function is called in getOtherModuleLabel, and is used to mark the
otherModule as an unconvertedDep. This meant that if a soong module `A`
depends on soong_zip, it would add soong_zip as unconverted dep of `A`.
All go modules have been converted in bp2build, so this CL special
cases go_package and go_binary in this function.

Bug: 294098662
Test: printf metrics in build_conversion.go# GenerateBazelTargets, and
made sure that the string "has unconverted.*soong_zip" does not appear

Change-Id: I8d1d0876c581f9b2eb72dafcb3a28bd5577bbb4c
parent 41f1eeef

android/bazel.go

+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import ( 


	"android/soong/ui/metrics/bp2build_metrics_proto"

	"github.com/google/blueprint"

	"github.com/google/blueprint/bootstrap"

	"github.com/google/blueprint/proptools"



	"android/soong/android/allowlists"
@@ -426,8 +427,23 @@ func MixedBuildsEnabled(ctx BaseModuleContext) MixedBuildEnabledStatus { 
	return ModuleIncompatibility

}



func isGoModule(module blueprint.Module) bool {

	if _, ok := module.(*bootstrap.GoPackage); ok {

		return true

	}

	if _, ok := module.(*bootstrap.GoBinary); ok {

		return true

	}

	return false

}



// ConvertedToBazel returns whether this module has been converted (with bp2build or manually) to Bazel.

func convertedToBazel(ctx BazelConversionContext, module blueprint.Module) bool {

	// Special-case bootstrap_go_package and bootstrap_go_binary

	// These do not implement Bazelable, but have been converted

	if isGoModule(module) {

		return true

	}

	b, ok := module.(Bazelable)

	if !ok {

		return false

android/bazel_paths.go

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ func getOtherModuleLabel(ctx BazelConversionPathContext, dep, tag string, 


func BazelModuleLabel(ctx BazelConversionPathContext, module blueprint.Module) string {

	// TODO(b/165114590): Convert tag (":name{.tag}") to corresponding Bazel implicit output targets.

	if !convertedToBazel(ctx, module) {

	if !convertedToBazel(ctx, module) || isGoModule(module) {

		return bp2buildModuleLabel(ctx, module)

	}

	b, _ := module.(Bazelable)