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

Unified Diff: build/android/test_runner.py

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_chromium.json ('k') | tools/telemetry/telemetry/internal/platform/android_device.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 9f1b22e56dd19e66e84ad72b97b081383bff7490..9a74f03cc5872f922fc3c643d1615234f1ab0353 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -19,6 +19,7 @@ import unittest
import devil_chromium
from devil import base_error
+from devil import devil_env
from devil.android import apk_helper
from devil.android import device_blacklist
from devil.android import device_errors
@@ -122,7 +123,7 @@ def ProcessCommonOptions(args):
if args.adb_path:
devil_custom_deps = {
'adb': {
- 'android_host': [args.adb_path]
+ devil_env.GetPlatform(): [args.adb_path]
}
}
« no previous file with comments | « build/android/devil_chromium.json ('k') | tools/telemetry/telemetry/internal/platform/android_device.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698