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

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

Issue 1511983002: [Android] Add x86_64 to devil_chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on mips fix 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 | « no previous file | 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',
20 'mips': 'forwarder_dist', 19 'mips': 'forwarder_dist',
21 'mips64': 'forwarder_dist', 20 'mips64': 'forwarder_dist',
21 'x86': 'forwarder_dist',
22 'x86_64': 'forwarder_dist',
22 }, 23 },
23 'forwarder_host': { 24 'forwarder_host': {
24 'any': 'host_forwarder', 25 'any': 'host_forwarder',
25 }, 26 },
26 'md5sum_device': { 27 'md5sum_device': {
27 'armeabi-v7a': 'md5sum_dist', 28 'armeabi-v7a': 'md5sum_dist',
28 'arm64-v8a': 'md5sum_dist', 29 'arm64-v8a': 'md5sum_dist',
29 'x86': 'md5sum_dist',
30 'mips': 'md5sum_dist', 30 'mips': 'md5sum_dist',
31 'mips64': 'md5sum_dist', 31 'mips64': 'md5sum_dist',
32 'x86': 'md5sum_dist',
33 'x86_64': 'md5sum_dist',
32 }, 34 },
33 'md5sum_host': { 35 'md5sum_host': {
34 'any': 'md5sum_bin_host', 36 'any': 'md5sum_bin_host',
35 }, 37 },
36 } 38 }
37 39
38 40
39 def Initialize(output_directory=None, custom_deps=None): 41 def Initialize(output_directory=None, custom_deps=None):
40 """Initializes devil with chromium's binaries and third-party libraries. 42 """Initializes devil with chromium's binaries and third-party libraries.
41 43
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 87 }
86 for dep_name, arch_dict in devil_dynamic_deps.iteritems() 88 for dep_name, arch_dict in devil_dynamic_deps.iteritems()
87 } 89 }
88 } 90 }
89 if custom_deps: 91 if custom_deps:
90 devil_dynamic_config['dependencies'].update(custom_deps) 92 devil_dynamic_config['dependencies'].update(custom_deps)
91 93
92 devil_env.config.Initialize( 94 devil_env.config.Initialize(
93 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG]) 95 configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG])
94 96
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698