[Android] Revise devil environment handling of host dependencies.

build/android/devil_chromium.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.
 
 """Configures devil for use in chromium."""
 
 import os
 
 from devil import devil_env
 
 
 _DEVIL_CONFIG = os.path.abspath(
     os.path.join(os.path.dirname(__file__), 'devil_chromium.json'))
 
 _DEVIL_BUILD_PRODUCT_DEPS = {
-  'forwarder_device': {
-    'armeabi-v7a': 'forwarder_dist',
-    'arm64-v8a': 'forwarder_dist',
-    'mips': 'forwarder_dist',
-    'mips64': 'forwarder_dist',
-    'x86': 'forwarder_dist',
-    'x86_64': 'forwarder_dist',
-  },
-  'forwarder_host': {
-    'any': 'host_forwarder',
-  },
-  'md5sum_device': {
-    'armeabi-v7a': 'md5sum_dist',
-    'arm64-v8a': 'md5sum_dist',
-    'mips': 'md5sum_dist',
-    'mips64': 'md5sum_dist',
-    'x86': 'md5sum_dist',
-    'x86_64': 'md5sum_dist',
-  },
-  'md5sum_host': {
-    'any': 'md5sum_bin_host',
-  },
+  'forwarder_device': [
+    {
+      'platform': 'android',
+      'arch': 'armeabi-v7a',

[rnephew (Wrong account), 2015/12/21 18:23:19]

why are some - and some _? This might be confusing, unless there is some rule on
when to use one vs the other.

[jbudorick, 2015/12/21 19:20:35]

it's what the device returns for ro.product.cpu.abi.

+      'name': 'forwarder_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'arm64-v8a',
+      'name': 'forwarder_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'mips',
+      'name': 'forwarder_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'mips64',
+      'name': 'forwarder_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'x86',
+      'name': 'forwarder_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'x86_64',
+      'name': 'forwarder_dist',
+    },
+  ],
+  'forwarder_host': [
+    {
+      'platform': 'linux',
+      'arch': 'x86_64',
+      'name': 'host_forwarder',
+    },
+  ],
+  'md5sum_device': [
+    {
+      'platform': 'android',
+      'arch': 'armeabi-v7a',
+      'name': 'md5sum_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'arm64-v8a',
+      'name': 'md5sum_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'mips',
+      'name': 'md5sum_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'mips64',
+      'name': 'md5sum_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'x86',
+      'name': 'md5sum_dist',
+    },
+    {
+      'platform': 'android',
+      'arch': 'x86_64',
+      'name': 'md5sum_dist',
+    },
+  ],
+  'md5sum_host': [
+    {
+      'platform': 'linux',
+      'arch': 'x86_64',
+      'name': 'md5sum_bin_host',
+    },
+  ],
 }
 
 
 def Initialize(output_directory=None, custom_deps=None):
   """Initializes devil with chromium's binaries and third-party libraries.
 
   This includes:
     - Libraries:
       - the android SDK ("android_sdk")
       - pymock ("pymock")
@@ skipping 10 matching lines @@
 
         {
           'dependency_name': {
             'platform': 'path',
             ...
           },
           ...
         }
   """
 
-  devil_dynamic_deps = {}
-
+  devil_dynamic_config = {}
   if output_directory:
-    for dep_name, arch_dict in _DEVIL_BUILD_PRODUCT_DEPS.iteritems():
-      devil_dynamic_deps[dep_name] = {}
-      for arch, name in arch_dict.iteritems():
-        devil_dynamic_deps[dep_name][arch] = os.path.join(
-            output_directory, name)
-
-  devil_dynamic_config = {
-    'config_type': 'BaseConfig',
-    'dependencies': {
-      dep_name: {
-        'file_info': {
-          'android_%s' % arch: {
-            'local_paths': [path]
+    devil_dynamic_config = {
+      'config_type': 'BaseConfig',
+      'dependencies': {
+        dep_name: {
+          'file_info': {
+            '%s_%s' % (dep_config['platform'], dep_config['arch']): {
+              'local_paths': [
+                os.path.join(output_directory, dep_config['name']),
+              ],
+            }
+            for dep_config in dep_configs
           }
-          for arch, path in arch_dict.iteritems()
         }
+        for dep_name, dep_configs in _DEVIL_BUILD_PRODUCT_DEPS.iteritems()
       }
-      for dep_name, arch_dict in devil_dynamic_deps.iteritems()
     }
-  }
   if custom_deps:
     devil_dynamic_config['dependencies'].update(custom_deps)
 
   devil_env.config.Initialize(
       configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG])