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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil_chromium.json
diff --git a/build/android/devil_chromium.json b/build/android/devil_chromium.json
index 99aabadd02870334e699574c0c04a232a2720d04..865e4a462e5b85c6777d1715550f77b9894a4b6a 100644
--- a/build/android/devil_chromium.json
+++ b/build/android/devil_chromium.json
@@ -3,7 +3,7 @@
"dependencies": {
"aapt": {
"file_info": {
- "android_host": {
+ "android_linux2": {
"local_paths": [
"../../third_party/android_tools/sdk/build-tools/23.0.0/aapt"
]
@@ -12,7 +12,7 @@
},
"adb": {
"file_info": {
- "android_host": {
+ "android_linux2": {
"local_paths": [
"../../third_party/android_tools/sdk/platform-tools/adb"
]
@@ -21,7 +21,7 @@
},
"android_sdk": {
"file_info": {
- "android_host": {
+ "android_linux2": {
"local_paths": [
"../../third_party/android_tools/sdk"
]
@@ -30,7 +30,7 @@
},
"dexdump": {
"file_info": {
- "android_host": {
+ "android_linux2": {
"local_paths": [
"../../third_party/android_tools/sdk/build-tools/23.0.0/dexdump"
]
@@ -39,7 +39,7 @@
},
"split-select": {
"file_info": {
- "android_host": {
+ "android_linux2": {
"local_paths": [
"../../third_party/android_tools/sdk/build-tools/23.0.0/split-select"
]
@@ -48,7 +48,17 @@
},
"pymock": {
"file_info": {
- "android_host": {
+ "android_darwin": {
+ "local_paths": [
+ "../../third_party/pymock"
+ ]
+ },
+ "android_linux2": {
+ "local_paths": [
+ "../../third_party/pymock"
+ ]
+ },
+ "android_win32": {
"local_paths": [
"../../third_party/pymock"
]
« 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