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

Unified Diff: build/android/devil/devil_dependencies.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/android/sdk/adb_wrapper.py ('k') | build/android/devil/devil_env.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/devil_dependencies.json
diff --git a/build/android/devil/devil_dependencies.json b/build/android/devil/devil_dependencies.json
index f55a983d4c9e1f8ea59d886b50e98ca9fb8752d8..2751648d32e1a31aad678203170f54a4b8f9e6d8 100644
--- a/build/android/devil/devil_dependencies.json
+++ b/build/android/devil/devil_dependencies.json
@@ -5,7 +5,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "7448de3cb5e834afdedeaad8b40ba63ac53f3dc4",
"download_path": "../bin/aapt"
}
@@ -15,7 +15,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "0c2043552619c8ec8bb5d986ba75703a598611fc",
"download_path": "../bin/adb"
}
@@ -25,7 +25,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "52d150a7ccde835f38b4337392152f3013d5f303",
"download_path": "../bin/lib/libc++.so"
}
@@ -35,7 +35,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "38765b5b358c29003e56b1d214606ea13467b6fe",
"download_path": "../bin/dexdump"
}
@@ -59,7 +59,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "b3dda9fbdd4a3fb933b64111c11070aa809c7ed4",
"download_path": "../bin/forwarder_host"
}
@@ -83,7 +83,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "49e36c9c4246cfebef26cbd07436c1a8343254aa",
"download_path": "../bin/md5sum_host"
}
@@ -91,7 +91,17 @@
},
"pymock": {
"file_info": {
- "android_host": {
+ "android_darwin": {
+ "local_paths": [
+ "../../../tools/telemetry/third_party/mock"
+ ]
+ },
+ "android_linux2": {
+ "local_paths": [
+ "../../../tools/telemetry/third_party/mock"
+ ]
+ },
+ "android_win32": {
"local_paths": [
"../../../tools/telemetry/third_party/mock"
]
@@ -102,7 +112,7 @@
"cloud_storage_bucket": "chromium-telemetry",
"cloud_storage_base_folder": "binary_dependencies",
"file_info": {
- "android_host": {
+ "android_linux2": {
"cloud_storage_hash": "3327881fa3951a503b9467425ea8e781cdffeb9f",
"download_path": "../bin/split-select"
}
« no previous file with comments | « build/android/devil/android/sdk/adb_wrapper.py ('k') | build/android/devil/devil_env.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698