From e8b1bc0a689322e2d8dcc92336af606b939c67c6 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 12 May 2016 19:03:10 -0700
Subject: Lock down environment variable access after all other singletons

To allow other singletons to use new environment variables, move env.go
to the end of the source list, so that its singleton is run last.

Change-Id: Ic92308f72fc0c92a0fedbc5546e337940e32eaab
---
 Android.bp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index c1d664f4..a9e41d9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,6 @@ bootstrap_go_package {
         "common/config.go",
         "common/defaults.go",
         "common/defs.go",
-        "common/env.go",
         "common/glob.go",
         "common/makevars.go",
         "common/module.go",
@@ -103,6 +102,9 @@ bootstrap_go_package {
         "common/paths.go",
         "common/util.go",
         "common/variable.go",
+
+        // Lock down environment access last
+        "common/env.go",
     ],
     testSrcs: [
         "common/paths_test.go",
-- 
cgit v1.2.3