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

Unified Diff: build/android/incremental_install/installer.py

Issue 1399273002: [Android] Add a configurable environment for devil/. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed: more non-default directory handling, especially for gyp_managed_install 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
Index: build/android/incremental_install/installer.py
diff --git a/build/android/incremental_install/installer.py b/build/android/incremental_install/installer.py
index 40d2d7b6704b1984035aea75ee04061e83a48408..6b2b6e3c34c97e224a4f1a035b5332a89c59d730 100755
--- a/build/android/incremental_install/installer.py
+++ b/build/android/incremental_install/installer.py
@@ -14,7 +14,13 @@ import posixpath
import shutil
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
+sys.path.append(
+ os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, 'gyp')))
+from util import build_utils
+
+sys.path.append(
+ os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)))
+import devil_chromium
from devil.android import apk_helper
from devil.android import device_utils
from devil.android import device_errors
@@ -24,9 +30,6 @@ from pylib import constants
from pylib.utils import run_tests_helper
from pylib.utils import time_profile
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'gyp'))
-from util import build_utils
-
def _TransformDexPaths(paths):
"""Given paths like ["/a/b/c", "/a/c/d"], returns ["b.c", "c.d"]."""
@@ -94,6 +97,8 @@ def main():
if args.output_directory:
constants.SetOutputDirectory(args.output_directory)
+ devil_chromium.Initialize()
+
main_timer = time_profile.TimeProfile()
install_timer = time_profile.TimeProfile()
push_native_timer = time_profile.TimeProfile()

Powered by Google App Engine
This is Rietveld 408576698