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

Unified Diff: build/android/devil_chromium.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/buildbot/bb_utils.py ('k') | build/android/emma_coverage_stats.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil_chromium.py
diff --git a/build/android/devil_chromium.py b/build/android/devil_chromium.py
index c7142ed63a0200ec1c8d59e90661b2bc7471bf8b..8472f659bdcfd1881f9bbff155f524236cbeec8d 100644
--- a/build/android/devil_chromium.py
+++ b/build/android/devil_chromium.py
@@ -5,9 +5,14 @@
"""Configures devil for use in chromium."""
import os
+import sys
-from devil import devil_env
+from pylib.constants import host_paths
+
+if host_paths.DEVIL_PATH not in sys.path:
+ sys.path.append(host_paths.DEVIL_PATH)
+from devil import devil_env
_DEVIL_CONFIG = os.path.abspath(
os.path.join(os.path.dirname(__file__), 'devil_chromium.json'))
@@ -126,6 +131,7 @@ def Initialize(output_directory=None, custom_deps=None):
'dependencies': {},
}
if output_directory:
+ output_directory = os.path.abspath(output_directory)
devil_dynamic_config['dependencies'] = {
dep_name: {
'file_info': {
« no previous file with comments | « build/android/buildbot/bb_utils.py ('k') | build/android/emma_coverage_stats.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698