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

Commit 7351875a authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Add HasMutatorFinished" into main

parents 252ec5a5 4e2bf9fb

android/androidmk.go

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ type fillInEntriesContext interface { 
	otherModuleProvider(module blueprint.Module, provider blueprint.AnyProviderKey) (any, bool)

	ModuleType(module blueprint.Module) string

	OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{})

	HasMutatorFinished(mutatorName string) bool

}



func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint.Module) {

android/base_module_context.go

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ type BaseModuleContext interface { 
	// EvaluateConfiguration makes ModuleContext a valid proptools.ConfigurableEvaluator, so this context

	// can be used to evaluate the final value of Configurable properties.

	EvaluateConfiguration(condition proptools.ConfigurableCondition, property string) proptools.ConfigurableValue



	// HasMutatorFinished returns true if the given mutator has finished running.

	// It will panic if given an invalid mutator name.

	HasMutatorFinished(mutatorName string) bool

}



type baseModuleContext struct {
@@ -270,6 +274,10 @@ func (b *baseModuleContext) setProvider(provider blueprint.AnyProviderKey, value 
	b.bp.SetProvider(provider, value)

}



func (b *baseModuleContext) HasMutatorFinished(mutatorName string) bool {

	return b.bp.HasMutatorFinished(mutatorName)

}



func (b *baseModuleContext) GetDirectDepWithTag(name string, tag blueprint.DependencyTag) blueprint.Module {

	return b.bp.GetDirectDepWithTag(name, tag)

}

android/paths.go

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ type ModuleWithDepsPathContext interface { 
	EarlyModulePathContext

	VisitDirectDepsBlueprint(visit func(blueprint.Module))

	OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag

	HasMutatorFinished(mutatorName string) bool

}



// ModuleMissingDepsPathContext is a subset of *ModuleContext methods required by

android/sdk.go

+0 −2
Original line number Diff line number Diff line
@@ -813,8 +813,6 @@ type SdkMemberProperties interface { 


// SdkMemberContext provides access to information common to a specific member.

type SdkMemberContext interface {

	ConfigurableEvaluatorContext



	// SdkModuleContext returns the module context of the sdk common os variant which is creating the

	// snapshot.

	//

android/singleton.go

+8 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ type SingletonContext interface { 


	// OtherModulePropertyErrorf reports an error on the line number of the given property of the given module

	OtherModulePropertyErrorf(module Module, property string, format string, args ...interface{})



	// HasMutatorFinished returns true if the given mutator has finished running.

	// It will panic if given an invalid mutator name.

	HasMutatorFinished(mutatorName string) bool

}



type singletonAdaptor struct {
@@ -286,3 +290,7 @@ func (s *singletonContextAdaptor) otherModuleProvider(module blueprint.Module, p 
func (s *singletonContextAdaptor) OtherModulePropertyErrorf(module Module, property string, format string, args ...interface{}) {

	s.blueprintSingletonContext().OtherModulePropertyErrorf(module, property, format, args...)

}



func (s *singletonContextAdaptor) HasMutatorFinished(mutatorName string) bool {

	return s.blueprintSingletonContext().HasMutatorFinished(mutatorName)

}