From 580d2ce64206bf56d8f829691e5571cca61fb59a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Sat, 9 Feb 2019 22:59:32 -0800 Subject: [PATCH] Run makevars singleton after all other registered singletons Move the makevars singleton after all dyamically registered singletons, but before the env singleton, to ensure that it can reference values initialized in other singletons. Test: m checkbuild Change-Id: I6ea45d3a174b94d4e89f3168894399e7022733e4 --- android/makevars.go | 4 ---- android/register.go | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/makevars.go b/android/makevars.go index 366bb6b61..2c2fb6f3c 100644 --- a/android/makevars.go +++ b/android/makevars.go @@ -92,10 +92,6 @@ func RegisterMakeVarsProvider(pctx PackageContext, provider MakeVarsProvider) { /////////////////////////////////////////////////////////////////////////////// -func init() { - RegisterSingletonType("makevars", makeVarsSingletonFunc) -} - func makeVarsSingletonFunc() Singleton { return &makeVarsSingleton{} } diff --git a/android/register.go b/android/register.go index 6c88af11e..10e14fe02 100644 --- a/android/register.go +++ b/android/register.go @@ -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)) }