[Android] Fix environment variable handling in devil_env.

build/android/devil/devil_env.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import json
 import logging
 import os
 import sys
 import tempfile
@@ skipping 29 matching lines @@
     'platform': 'android_linux2',
   },
   'ANDROID_SDK_ROOT': {
     'dependency_name': 'android_sdk',
     'platform': 'android_linux2',
   },
 }
 
 
 def _GetEnvironmentVariableConfig():
-  env_var_config = {}
-  for k, v in _LEGACY_ENVIRONMENT_VARIABLES.iteritems():
-    path = os.environ.get(k)
-    if path:
-      env_var_config[v['dependency_name']] = {
+  path_config = (
+      (os.environ.get(k), v)
+      for k, v in _LEGACY_ENVIRONMENT_VARIABLES.iteritems())
+  return {
+    'config_type': 'BaseConfig',
+    'dependencies': {
+      c['dependency_name']: {
         'file_info': {
-          v['platform']: {
-            'local_paths': [path]
-          }
-        }
-      }
-  return env_var_config
+          c['platform']: {
+            'local_paths': [p],
+          },
+        },
+      } for p, c in path_config if p
+    },
+  }
 
 
 class _Environment(object):
 
   def __init__(self):
     self._dm_init_lock = threading.Lock()
     self._dm = None
 
   def Initialize(self, configs=None, config_files=None):
     """Initialize devil's environment from configuration files.
@@ skipping 21 matching lines @@
             configs=configs,
             config_files=config_files)
         assert self._dm is not None, 'Failed to create dependency manager.'
 
   def _InitializeRecursive(self, configs=None, config_files=None):
     # This recurses through configs to create temporary files for each and
     # take advantage of context managers to appropriately close those files.
     # TODO(jbudorick): Remove this recursion if/when dependency_manager
     # supports loading configurations directly from a dict.
     if configs:
-      with tempfile.NamedTemporaryFile() as next_config_file:
-        next_config_file.write(json.dumps(configs[0]))
-        next_config_file.flush()
-        self._InitializeRecursive(
-            configs=configs[1:],
-            config_files=[next_config_file.name] + (config_files or []))
+      with tempfile.NamedTemporaryFile(delete=False) as next_config_file:
+        try:
+          next_config_file.write(json.dumps(configs[0]))
+          next_config_file.close()
+          self._InitializeRecursive(
+              configs=configs[1:],
+              config_files=[next_config_file.name] + (config_files or []))
+        finally:
+          if os.path.exists(next_config_file.name):
+            os.remove(next_config_file.name)
     else:
       config_files = config_files or []
       if 'DEVIL_ENV_CONFIG' in os.environ:
         config_files.append(os.environ.get('DEVIL_ENV_CONFIG'))
       config_files.append(_DEVIL_DEFAULT_CONFIG)
 
       self._dm = dependency_manager.DependencyManager(
           [dependency_manager.BaseConfig(c) for c in config_files])
 
   def FetchPath(self, dependency, arch=None, device=None):
@@ skipping 10 matching lines @@
 
 
 def GetPlatform(arch=None, device=None):
   if not arch:
     arch = device.product_cpu_abi if device else sys.platform
   return 'android_%s' % arch
 
 
 config = _Environment()