| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Configures devil for use in chromium.""" | 5 """Configures devil for use in chromium.""" |
| 6 | 6 |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 from devil import devil_env | 9 from devil import devil_env |
| 10 | 10 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 'name': 'forwarder_dist', | 40 'name': 'forwarder_dist', |
| 41 }, | 41 }, |
| 42 { | 42 { |
| 43 'platform': 'android', | 43 'platform': 'android', |
| 44 'arch': 'x86_64', | 44 'arch': 'x86_64', |
| 45 'name': 'forwarder_dist', | 45 'name': 'forwarder_dist', |
| 46 }, | 46 }, |
| 47 ], | 47 ], |
| 48 'forwarder_host': [ | 48 'forwarder_host': [ |
| 49 { | 49 { |
| 50 'platform': 'linux', | 50 'platform': 'linux2', |
| 51 'arch': 'x86_64', | 51 'arch': 'x86_64', |
| 52 'name': 'host_forwarder', | 52 'name': 'host_forwarder', |
| 53 }, | 53 }, |
| 54 ], | 54 ], |
| 55 'md5sum_device': [ | 55 'md5sum_device': [ |
| 56 { | 56 { |
| 57 'platform': 'android', | 57 'platform': 'android', |
| 58 'arch': 'armeabi-v7a', | 58 'arch': 'armeabi-v7a', |
| 59 'name': 'md5sum_dist', | 59 'name': 'md5sum_dist', |
| 60 }, | 60 }, |
| (...skipping 18 matching lines...) Expand all Loading... |
| 79 'name': 'md5sum_dist', | 79 'name': 'md5sum_dist', |
| 80 }, | 80 }, |
| 81 { | 81 { |
| 82 'platform': 'android', | 82 'platform': 'android', |
| 83 'arch': 'x86_64', | 83 'arch': 'x86_64', |
| 84 'name': 'md5sum_dist', | 84 'name': 'md5sum_dist', |
| 85 }, | 85 }, |
| 86 ], | 86 ], |
| 87 'md5sum_host': [ | 87 'md5sum_host': [ |
| 88 { | 88 { |
| 89 'platform': 'linux', | 89 'platform': 'linux2', |
| 90 'arch': 'x86_64', | 90 'arch': 'x86_64', |
| 91 'name': 'md5sum_bin_host', | 91 'name': 'md5sum_bin_host', |
| 92 }, | 92 }, |
| 93 ], | 93 ], |
| 94 } | 94 } |
| 95 | 95 |
| 96 | 96 |
| 97 def Initialize(output_directory=None, custom_deps=None): | 97 def Initialize(output_directory=None, custom_deps=None): |
| 98 """Initializes devil with chromium's binaries and third-party libraries. | 98 """Initializes devil with chromium's binaries and third-party libraries. |
| 99 | 99 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 138 } |
| 139 } | 139 } |
| 140 for dep_name, dep_configs in _DEVIL_BUILD_PRODUCT_DEPS.iteritems() | 140 for dep_name, dep_configs in _DEVIL_BUILD_PRODUCT_DEPS.iteritems() |
| 141 } | 141 } |
| 142 if custom_deps: | 142 if custom_deps: |
| 143 devil_dynamic_config['dependencies'].update(custom_deps) | 143 devil_dynamic_config['dependencies'].update(custom_deps) |
| 144 | 144 |
| 145 devil_env.config.Initialize( | 145 devil_env.config.Initialize( |
| 146 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG]) | 146 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG]) |
| 147 | 147 |
| OLD | NEW |