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

Commit 617b88a2 authored by Colin Cross's avatar Colin Cross
Browse files

Create os and arch variants for bootstrap Go modules 

AddFarVariationDependencies was broken, which allowed modules to add
dependencies on bootstrap Go modules using os and arch variations
even though boostrap Go modules did not have any variations.  Mutate
bootstrap Go modules in the os and arch mutators so that they have the
expected os and arch variations.

This relands Ida7bc75a51ab1d2d38a6be11f574399097380cc9 with fixes
to also mutate *bootstrap.goPackage modules so that they can find a
matching *bootstrap.goBinary module when creating their pluginFor
dependency, and to create a variation for linux_bionic when it is
enabled so that linux_bionic builds can package Go binaries.

Also requries https://github.com/google/blueprint/pull/320 to
support multiple variants of bootstrap Go modules.

Test: all soong tests
Change-Id: Ibc627aa262c298a076d171a4c21b0b9c2a7b0ada
parent b695937f

android/arch.go

+34 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import ( 
	"strings"



	"github.com/google/blueprint"

	"github.com/google/blueprint/bootstrap"

	"github.com/google/blueprint/proptools"

)
@@ -689,13 +690,31 @@ func (target Target) Variations() []blueprint.Variation { 
	}

}



func osMutator(mctx BottomUpMutatorContext) {

func osMutator(bpctx blueprint.BottomUpMutatorContext) {

	var module Module

	var ok bool

	if module, ok = mctx.Module().(Module); !ok {

	if module, ok = bpctx.Module().(Module); !ok {

		if bootstrap.IsBootstrapModule(bpctx.Module()) {

			// Bootstrap Go modules are always the build OS or linux bionic.

			config := bpctx.Config().(Config)

			osNames := []string{config.BuildOSTarget.OsVariation()}

			for _, hostCrossTarget := range config.Targets[LinuxBionic] {

				if hostCrossTarget.Arch.ArchType == config.BuildOSTarget.Arch.ArchType {

					osNames = append(osNames, hostCrossTarget.OsVariation())

				}

			}

			osNames = FirstUniqueStrings(osNames)

			bpctx.CreateVariations(osNames...)

		}

		return

	}



	// Bootstrap Go module support above requires this mutator to be a

	// blueprint.BottomUpMutatorContext because android.BottomUpMutatorContext

	// filters out non-Soong modules.  Now that we've handled them, create a

	// normal android.BottomUpMutatorContext.

	mctx := bottomUpMutatorContextFactory(bpctx, module, false)



	base := module.base()



	if !base.ArchSpecific() {
@@ -819,13 +838,23 @@ func GetOsSpecificVariantsOfCommonOSVariant(mctx BaseModuleContext) []Module { 
//

// Modules can be initialized with InitAndroidMultiTargetsArchModule, in which case they will be split by OsClass,

// but will have a common Target that is expected to handle all other selected Targets via ctx.MultiTargets().

func archMutator(mctx BottomUpMutatorContext) {

func archMutator(bpctx blueprint.BottomUpMutatorContext) {

	var module Module

	var ok bool

	if module, ok = mctx.Module().(Module); !ok {

	if module, ok = bpctx.Module().(Module); !ok {

		if bootstrap.IsBootstrapModule(bpctx.Module()) {

			// Bootstrap Go modules are always the build architecture.

			bpctx.CreateVariations(bpctx.Config().(Config).BuildOSTarget.ArchVariation())

		}

		return

	}



	// Bootstrap Go module support above requires this mutator to be a

	// blueprint.BottomUpMutatorContext because android.BottomUpMutatorContext

	// filters out non-Soong modules.  Now that we've handled them, create a

	// normal android.BottomUpMutatorContext.

	mctx := bottomUpMutatorContextFactory(bpctx, module, false)



	base := module.base()



	if !base.ArchSpecific() {
@@ -903,7 +932,7 @@ func archMutator(mctx BottomUpMutatorContext) { 
	modules := mctx.CreateVariations(targetNames...)

	for i, m := range modules {

		addTargetProperties(m, targets[i], multiTargets, i == 0)

		m.(Module).base().setArchProperties(mctx)

		m.base().setArchProperties(mctx)

	}

}

android/mutator.go

+20 −8
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ type registerMutatorsContext struct { 
type RegisterMutatorsContext interface {

	TopDown(name string, m TopDownMutator) MutatorHandle

	BottomUp(name string, m BottomUpMutator) MutatorHandle

	BottomUpBlueprint(name string, m blueprint.BottomUpMutator) MutatorHandle

}



type RegisterMutatorFunc func(RegisterMutatorsContext)
@@ -143,9 +144,9 @@ var preArch = []RegisterMutatorFunc{ 
}



func registerArchMutator(ctx RegisterMutatorsContext) {

	ctx.BottomUp("os", osMutator).Parallel()

	ctx.BottomUpBlueprint("os", osMutator).Parallel()

	ctx.BottomUp("image", imageMutator).Parallel()

	ctx.BottomUp("arch", archMutator).Parallel()

	ctx.BottomUpBlueprint("arch", archMutator).Parallel()

}



var preDeps = []RegisterMutatorFunc{
@@ -225,16 +226,21 @@ type bottomUpMutatorContext struct { 
	finalPhase bool

}



func (x *registerMutatorsContext) BottomUp(name string, m BottomUpMutator) MutatorHandle {

	finalPhase := x.finalPhase

	f := func(ctx blueprint.BottomUpMutatorContext) {

		if a, ok := ctx.Module().(Module); ok {

			actx := &bottomUpMutatorContext{

func bottomUpMutatorContextFactory(ctx blueprint.BottomUpMutatorContext, a Module,

	finalPhase bool) BottomUpMutatorContext {



	return &bottomUpMutatorContext{

		bp:                ctx,

		baseModuleContext: a.base().baseModuleContextFactory(ctx),

		finalPhase:        finalPhase,

	}

			m(actx)

}



func (x *registerMutatorsContext) BottomUp(name string, m BottomUpMutator) MutatorHandle {

	finalPhase := x.finalPhase

	f := func(ctx blueprint.BottomUpMutatorContext) {

		if a, ok := ctx.Module().(Module); ok {

			m(bottomUpMutatorContextFactory(ctx, a, finalPhase))

		}

	}

	mutator := &mutator{name: name, bottomUpMutator: f}
@@ -242,6 +248,12 @@ func (x *registerMutatorsContext) BottomUp(name string, m BottomUpMutator) Mutat 
	return mutator

}



func (x *registerMutatorsContext) BottomUpBlueprint(name string, m blueprint.BottomUpMutator) MutatorHandle {

	mutator := &mutator{name: name, bottomUpMutator: m}

	x.mutators = append(x.mutators, mutator)

	return mutator

}



func (x *registerMutatorsContext) TopDown(name string, m TopDownMutator) MutatorHandle {

	f := func(ctx blueprint.TopDownMutatorContext) {

		if a, ok := ctx.Module().(Module); ok {