[Android] Fix environment variable handling in devil_env.

build/android/devil/devil_env.py

Index: build/android/devil/devil_env.py
diff --git a/build/android/devil/devil_env.py b/build/android/devil/devil_env.py
index f477b470e892e64406279bba848db41a62352442..600663b34515bcbcb101e058f2fa1cdc5c91cd7b 100644
--- a/build/android/devil/devil_env.py
+++ b/build/android/devil/devil_env.py
@@ -47,18 +47,21 @@ _LEGACY_ENVIRONMENT_VARIABLES = {
 
 
 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
+    },
+  }
 

[mikecase (-- gone --), 2015/12/08 03:44:27]

This change just adds the 'config_type': 'BaseConfig' line, right? Nothing else
has changed. I mean, I have no idea what this dict does, so I am assuming it is
not correct.

[jbudorick, 2015/12/08 03:48:17]

this change both adds 'config_type' and moves the existing dict to
'dependencies'

[mikecase (-- gone --), 2015/12/08 04:27:22]

oops, typo in my first comment, I meant to say I am assuming this new dict IS
correct. looks good.

 
 class _Environment(object):