build/android/pylib/forwarder.py - Issue 645093002: Revert of [Android] Add zip pushing and refine push mode selection.

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/pylib/forwarder.py

Issue 645093002: Revert of [Android] Add zip pushing and refine push mode selection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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/pylib/forwarder.py

diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py

index 5e45043089480b3270e946d398418673c13fad8e..db6ea03a479e9a76376315d07eb12e7dffd95f67 100644

--- a/build/android/pylib/forwarder.py

+++ b/build/android/pylib/forwarder.py

@@ -288,9 +288,9 @@ class Forwarder(object):

if device_serial in self._initialized_devices:

return

Forwarder._KillDeviceLocked(device, tool)

- device.PushChangedFiles([(

+ device.PushChangedFiles(

self._device_forwarder_path_on_host,

- Forwarder._DEVICE_FORWARDER_FOLDER)])

+ Forwarder._DEVICE_FORWARDER_FOLDER)

cmd = '%s %s' % (tool.GetUtilWrapper(), Forwarder._DEVICE_FORWARDER_PATH)

(exit_code, output) = device.old_interface.GetAndroidToolStatusAndOutput(

cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)

« no previous file with comments | « build/android/pylib/device/device_utils_test.py ('k') | build/android/pylib/gtest/test_package_apk.py » ('j') | no next file with comments »