Index: build/android/test_runner.py |
diff --git a/build/android/test_runner.py b/build/android/test_runner.py |
index a3a3a98aca283509202c1446145d9838a6ee1820..6d53045e8760e998a3accd0c795cd6d22d0daca5 100755 |
--- a/build/android/test_runner.py |
+++ b/build/android/test_runner.py |
@@ -16,6 +16,8 @@ import sys |
import threading |
import unittest |
+import devil_chromium |
+ |
from devil import base_error |
from devil.android import apk_helper |
from devil.android import device_blacklist |
@@ -49,6 +51,10 @@ from pylib.uiautomator import setup as uiautomator_setup |
from pylib.uiautomator import test_options as uiautomator_test_options |
+_DEVIL_STATIC_CONFIG_FILE = os.path.abspath(os.path.join( |
+ constants.DIR_SOURCE_ROOT, 'build', 'android', 'devil_config.json')) |
+ |
+ |
def AddCommonOptions(parser): |
"""Adds all common options to |parser|.""" |
@@ -113,6 +119,9 @@ def ProcessCommonOptions(args): |
constants.SetOutputDirectory(args.output_directory) |
if args.adb_path: |
constants.SetAdbPath(args.adb_path) |
+ |
+ devil_chromium.Initialize() |
+ |
# Some things such as Forwarder require ADB to be in the environment path. |
adb_dir = os.path.dirname(constants.GetAdbPath()) |
if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep): |