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

Commit 785bad31 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Run makevars singleton after all other registered singletons" am: a838004f 

am: f54b401b

Change-Id: I9939b45f279b9fb409e94c48a51f8ffdc950a642
parents 283a93f1 f54b401b

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

}