StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run makevars singleton after all other registered singletons"

Browse Source
This commit is contained in:
Colin Cross
2019-02-13 00:27:33 +00:00
committed by Gerrit Code Review
parent 75569e0f46 580d2ce642
commit a838004f8c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/makevars.go
View File

@@ -92,10 +92,6 @@ func RegisterMakeVarsProvider(pctx PackageContext, provider MakeVarsProvider) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
func init() {
RegisterSingletonType("makevars", makeVarsSingletonFunc)
}
func makeVarsSingletonFunc() Singleton { func makeVarsSingletonFunc() Singleton {
return &makeVarsSingleton{} return &makeVarsSingleton{}
} }

4
android/register.go
View File

@@ -99,5 +99,9 @@ func (ctx *Context) Register() {
registerMutators(ctx.Context, preArch, preDeps, postDeps) 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)) ctx.RegisterSingletonType("env", SingletonFactoryAdaptor(EnvSingleton))
} }