commit e8b1bc0a689322e2d8dcc92336af606b939c67c6
author Dan Willemsen <dwillemsen@google.com> Thu May 12 19:03:10 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu May 12 19:03:10 2016 -0700
tree c8ca5b4b26ec926c79f892060ff167043e0083a3
parent 7f08e2194177daafbc9c103a7d3f7df1bd0903d7

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

diff --git a/Android.bp b/Android.bp
index c1d664f..a9e41d9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,6 @@
         "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 @@
         "common/paths.go",
         "common/util.go",
         "common/variable.go",
+
+        // Lock down environment access last
+        "common/env.go",
     ],
     testSrcs: [
         "common/paths_test.go",