[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 19 matching lines @@
   from catapult_base import dependency_manager # pylint: disable=import-error
 
 _ANDROID_BUILD_TOOLS = {'aapt', 'dexdump', 'split-select'}
 
 _DEVIL_DEFAULT_CONFIG = os.path.abspath(os.path.join(
     os.path.dirname(__file__), 'devil_dependencies.json'))
 
 _LEGACY_ENVIRONMENT_VARIABLES = {
   'ADB_PATH': {
     'dependency_name': 'adb',
     'platform': 'android_linux2',

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

android_linux2 comes from here.

   },
   '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
+    },
+  }
 

[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):
 
   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 56 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()