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

Commit a838004f authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Run makevars singleton after all other registered singletons"

parents 75569e0f 580d2ce6

android/makevars.go

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ func RegisterMakeVarsProvider(pctx PackageContext, provider MakeVarsProvider) { 


///////////////////////////////////////////////////////////////////////////////



func init() {

	RegisterSingletonType("makevars", makeVarsSingletonFunc)

}



func makeVarsSingletonFunc() Singleton {

	return &makeVarsSingleton{}

}

android/register.go

+4 −0
Original line number Diff line number Diff line
@@ -99,5 +99,9 @@ func (ctx *Context) Register() { 


	registerMutators(ctx.Context, preArch, preDeps, postDeps)



	// Register makevars after other singletons so they can export values through makevars

	ctx.RegisterSingletonType("makevars", SingletonFactoryAdaptor(makeVarsSingletonFunc))



	// Register env last so that it can track all used environment variables

	ctx.RegisterSingletonType("env", SingletonFactoryAdaptor(EnvSingleton))

}