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

Unified Diff: build/android/test_runner.py

Issue 1415413005: Revert of [Android] Add a configurable environment for devil/. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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/setup.gyp ('k') | build/android/tombstones.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 d8828a2953d30440965bb493cf59e7cb6ca271d6..dc683cb5d993fbd0b84a5f8279c0b9ce28dfc859 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -15,8 +15,6 @@
import sys
import threading
import unittest
-
-import devil_chromium
from devil import base_error
from devil.android import apk_helper
@@ -47,10 +45,6 @@
from pylib.perf import test_runner as perf_test_runner
from pylib.results import json_results
from pylib.results import report_results
-
-
-_DEVIL_STATIC_CONFIG_FILE = os.path.abspath(os.path.join(
- constants.DIR_SOURCE_ROOT, 'build', 'android', 'devil_config.json'))
def AddCommonOptions(parser):
@@ -117,9 +111,6 @@
constants.SetOutputDirectory(args.output_directory)
if args.adb_path:
constants.SetAdbPath(args.adb_path)
-
- devil_chromium.Initialize(output_directory=constants.GetOutDirectory())
-
# 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):
« no previous file with comments | « build/android/setup.gyp ('k') | build/android/tombstones.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698