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

Merge "Fix envDeps initialization and locking" am: ae853ae0c0

Browse Source 
am: d84437067c

Change-Id: I5facd3f53ab7cd23e8bb3ca731062c7e340ca72c
This commit is contained in:
Colin Cross
2017-02-07 05:53:46 +00:00
committed by android-build-merger
parent fbbb453a58 d84437067c
commit 24ff243f57
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -177,7 +177,6 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
srcDir: srcDir, srcDir: srcDir,
buildDir: buildDir, buildDir: buildDir,
envDeps: make(map[string]string),
deviceConfig: &deviceConfig{}, deviceConfig: &deviceConfig{},
} }
@@ -281,6 +280,10 @@ func (c *config) Getenv(key string) string {
var val string var val string
var exists bool var exists bool
c.envLock.Lock() c.envLock.Lock()
defer c.envLock.Unlock()
if c.envDeps == nil {
c.envDeps = make(map[string]string)
}
if val, exists = c.envDeps[key]; !exists { if val, exists = c.envDeps[key]; !exists {
if c.envFrozen { if c.envFrozen {
panic("Cannot access new environment variables after envdeps are frozen") panic("Cannot access new environment variables after envdeps are frozen")
@@ -288,7 +291,6 @@ func (c *config) Getenv(key string) string {
val = os.Getenv(key) val = os.Getenv(key)
c.envDeps[key] = val c.envDeps[key] = val
} }
c.envLock.Unlock()
return val return val
} }
@@ -312,8 +314,8 @@ func (c *config) IsEnvFalse(key string) bool {
func (c *config) EnvDeps() map[string]string { func (c *config) EnvDeps() map[string]string {
c.envLock.Lock() c.envLock.Lock()
defer c.envLock.Unlock()
c.envFrozen = true c.envFrozen = true
c.envLock.Unlock()
return c.envDeps return c.envDeps
} }