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

Unified Diff: build/android/pylib/base/base_setup.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links
Patch Set: rebase Created 4 years, 11 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/pylib/__init__.py ('k') | build/android/pylib/base/test_dispatcher_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/base/base_setup.py
diff --git a/build/android/pylib/base/base_setup.py b/build/android/pylib/base/base_setup.py
index 84441dc354f60a6d482b7af67c21a6f89fad7ae4..ac4d108c41e21b89f28bc7e8c98faca4ecceb681 100644
--- a/build/android/pylib/base/base_setup.py
+++ b/build/android/pylib/base/base_setup.py
@@ -9,6 +9,7 @@ import os
from pylib import constants
from pylib import valgrind_tools
+from pylib.constants import host_paths
from pylib.utils import isolator
def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path,
@@ -30,14 +31,15 @@ def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path,
if os.path.isabs(isolate_file_path):
isolate_abs_path = isolate_file_path
else:
- isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT,
+ isolate_abs_path = os.path.join(host_paths.DIR_SOURCE_ROOT,
isolate_file_path)
else:
isolate_rel_path = isolate_file_paths.get(suite_name)
if not isolate_rel_path:
logging.info('Did not find an isolate file for the test suite.')
return
- isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path)
+ isolate_abs_path = os.path.join(host_paths.DIR_SOURCE_ROOT,
+ isolate_rel_path)
isolated_abs_path = os.path.join(
constants.GetOutDirectory(), '%s.isolated' % suite_name)
« no previous file with comments | « build/android/pylib/__init__.py ('k') | build/android/pylib/base/test_dispatcher_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698