commit 4068a5db6c60d890e4d49379d600fd34ee94fdec
author Dan Willemsen <dwillemsen@google.com> Mon May 08 21:11:55 2017 +0000
committer Dan Willemsen <dwillemsen@google.com> Mon May 08 21:11:55 2017 +0000
tree 930d281244a441230b1c78c8f92256e93ea6c7ed
parent e78473c33ce9b4a827e814229836d136581ad80e

Revert "Ensure environment dependencies are correct"

This reverts commit e78473c33ce9b4a827e814229836d136581ad80e.

Reason for revert: Broke mac builds, which rely on $PATH to find xcrun

Change-Id: I58711b94d472ab828823afaf53394a1aa869f3f5

android/config.go

diff --git a/android/config.go b/android/config.go
index e349336..8be16cf 100644
--- a/android/config.go
+++ b/android/config.go
@@ -289,7 +289,7 @@
 		if c.envFrozen {
 			panic("Cannot access new environment variables after envdeps are frozen")
 		}
-		val, _ = originalEnv[key]
+		val = os.Getenv(key)
 		c.envDeps[key] = val
 	}
 	return val