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

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

Issue 1501843002: [Android] Use more specific host platforms for devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better handling of the no adb case 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_env.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 "config_type": "BaseConfig", 2 "config_type": "BaseConfig",
3 "dependencies": { 3 "dependencies": {
4 "aapt": { 4 "aapt": {
5 "file_info": { 5 "file_info": {
6 "android_host": { 6 "android_linux2": {
7 "local_paths": [ 7 "local_paths": [
8 "../../third_party/android_tools/sdk/build-tools/23.0.0/aapt" 8 "../../third_party/android_tools/sdk/build-tools/23.0.0/aapt"
9 ] 9 ]
10 } 10 }
11 } 11 }
12 }, 12 },
13 "adb": { 13 "adb": {
14 "file_info": { 14 "file_info": {
15 "android_host": { 15 "android_linux2": {
16 "local_paths": [ 16 "local_paths": [
17 "../../third_party/android_tools/sdk/platform-tools/adb" 17 "../../third_party/android_tools/sdk/platform-tools/adb"
18 ] 18 ]
19 } 19 }
20 } 20 }
21 }, 21 },
22 "android_sdk": { 22 "android_sdk": {
23 "file_info": { 23 "file_info": {
24 "android_host": { 24 "android_linux2": {
25 "local_paths": [ 25 "local_paths": [
26 "../../third_party/android_tools/sdk" 26 "../../third_party/android_tools/sdk"
27 ] 27 ]
28 } 28 }
29 } 29 }
30 }, 30 },
31 "dexdump": { 31 "dexdump": {
32 "file_info": { 32 "file_info": {
33 "android_host": { 33 "android_linux2": {
34 "local_paths": [ 34 "local_paths": [
35 "../../third_party/android_tools/sdk/build-tools/23.0.0/dexdump" 35 "../../third_party/android_tools/sdk/build-tools/23.0.0/dexdump"
36 ] 36 ]
37 } 37 }
38 } 38 }
39 }, 39 },
40 "split-select": { 40 "split-select": {
41 "file_info": { 41 "file_info": {
42 "android_host": { 42 "android_linux2": {
43 "local_paths": [ 43 "local_paths": [
44 "../../third_party/android_tools/sdk/build-tools/23.0.0/split-select " 44 "../../third_party/android_tools/sdk/build-tools/23.0.0/split-select "
45 ] 45 ]
46 } 46 }
47 } 47 }
48 }, 48 },
49 "pymock": { 49 "pymock": {
50 "file_info": { 50 "file_info": {
51 "android_host": { 51 "android_darwin": {
52 "local_paths": [ 52 "local_paths": [
53 "../../third_party/pymock" 53 "../../third_party/pymock"
54 ] 54 ]
55 },
56 "android_linux2": {
57 "local_paths": [
58 "../../third_party/pymock"
59 ]
60 },
61 "android_win32": {
62 "local_paths": [
63 "../../third_party/pymock"
64 ]
55 } 65 }
56 } 66 }
57 } 67 }
58 } 68 }
59 } 69 }
OLDNEW
« no previous file with comments | « build/android/devil/devil_env.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698