commit e29693bed4c3a0db11d68ac69ba1131b04661c51
author jbudorick <jbudorick@chromium.org> Mon Dec 07 15:53:23 2015
committer Commit bot <commit-bot@chromium.org> Mon Dec 07 15:54:14 2015
tree b42a3b6f1926c9790a385b1d1fc792953cedf9d0
parent 14957bec254f6dfe72189c1fa56ed7ea579e6e78

[Android] Use more specific host platforms for devil.

BUG=566160,566170

Review URL: https://codereview.chromium.org/1501843002

Cr-Commit-Position: refs/heads/master@{#363488}

build/android/test_runner.py

diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 9f1b22e..9a74f03c 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -19,6 +19,7 @@
 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 @@
   if args.adb_path:
     devil_custom_deps = {
       'adb': {
-        'android_host': [args.adb_path]
+        devil_env.GetPlatform(): [args.adb_path]
       }
     }