build/android/incremental_install/installer.py - Issue 1415413005: Revert of [Android] Add a configurable environment for devil/. (RELAND)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/incremental_install/installer.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

Index: build/android/incremental_install/installer.py

diff --git a/build/android/incremental_install/installer.py b/build/android/incremental_install/installer.py

index f38852cf75802e2df22663061436f4315cab2a7b..b5ed5cec9d570be9993cc935362239eb9bcd5695 100755

--- a/build/android/incremental_install/installer.py

+++ b/build/android/incremental_install/installer.py

@@ -14,9 +14,7 @@

import shutil

import sys

-sys.path.append(

- os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)))

-import devil_chromium

+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))

from devil.android import apk_helper

from devil.android import device_utils

from devil.android import device_errors

@@ -234,8 +232,6 @@

if args.output_directory:

constants.SetOutputDirectory(args.output_directory)

- devil_chromium.Initialize(output_directory=constants.GetOutputDirectory())

if args.device:

# Retries are annoying when commands fail for legitimate reasons. Might want

# to enable them if this is ever used on bots though.

« no previous file with comments | « build/android/gyp/util/build_device.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »