Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: build/android/devil_chromium.py

Issue 1503633002: add md5sum device bin for x86 to dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add x86 to devil_chromium.py Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/devil/devil_dependencies.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 11
12 _DEVIL_CONFIG = os.path.abspath( 12 _DEVIL_CONFIG = os.path.abspath(
13 os.path.join(os.path.dirname(__file__), 'devil_chromium.json')) 13 os.path.join(os.path.dirname(__file__), 'devil_chromium.json'))
14 14
15 _DEVIL_BUILD_PRODUCT_DEPS = { 15 _DEVIL_BUILD_PRODUCT_DEPS = {
16 'forwarder_device': { 16 'forwarder_device': {
17 'armeabi-v7a': 'forwarder_dist', 17 'armeabi-v7a': 'forwarder_dist',
18 'arm64-v8a': 'forwarder_dist', 18 'arm64-v8a': 'forwarder_dist',
19 'x86': 'forwarder_dist',
19 }, 20 },
20 'forwarder_host': { 21 'forwarder_host': {
21 'any': 'host_forwarder', 22 'any': 'host_forwarder',
22 }, 23 },
23 'md5sum_device': { 24 'md5sum_device': {
24 'armeabi-v7a': 'md5sum_dist', 25 'armeabi-v7a': 'md5sum_dist',
25 'arm64-v8a': 'md5sum_dist', 26 'arm64-v8a': 'md5sum_dist',
27 'x86': 'md5sum_dist',
26 }, 28 },
27 'md5sum_host': { 29 'md5sum_host': {
28 'any': 'md5sum_bin_host', 30 'any': 'md5sum_bin_host',
29 }, 31 },
30 } 32 }
31 33
32 34
33 def Initialize(output_directory=None, custom_deps=None): 35 def Initialize(output_directory=None, custom_deps=None):
34 """Initializes devil with chromium's binaries and third-party libraries. 36 """Initializes devil with chromium's binaries and third-party libraries.
35 37
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 81 }
80 for dep_name, arch_dict in devil_dynamic_deps.iteritems() 82 for dep_name, arch_dict in devil_dynamic_deps.iteritems()
81 } 83 }
82 } 84 }
83 if custom_deps: 85 if custom_deps:
84 devil_dynamic_config['dependencies'].update(custom_deps) 86 devil_dynamic_config['dependencies'].update(custom_deps)
85 87
86 devil_env.config.Initialize( 88 devil_env.config.Initialize(
87 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG]) 89 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG])
88 90
OLDNEW
« no previous file with comments | « build/android/devil/devil_dependencies.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698