build/android/pylib/forwarder.py - Issue 358993003: [Android] Switch to DeviceUtils versions of file functions.

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 358993003: [Android] Switch to DeviceUtils versions of file functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 6 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 f0ddb2e5a6f683e412c2ca0db8c3db0479967d3a..ad22838d87291d7d2421bb176392155c1473a759 100644

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

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

@@ -290,7 +290,7 @@ class Forwarder(object):

if device_serial in self._initialized_devices:

return

Forwarder._KillDeviceLocked(device, tool)

- device.old_interface.PushIfNeeded(

+ device.PushChangedFiles(

self._device_forwarder_path_on_host,

Forwarder._DEVICE_FORWARDER_FOLDER)

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

@@ -328,8 +328,7 @@ class Forwarder(object):

forwarder (see valgrind_tools.py).

"""

logging.info('Killing device_forwarder.')

- if not device.old_interface.FileExistsOnDevice(

- Forwarder._DEVICE_FORWARDER_PATH):

+ if not device.FileExists(Forwarder._DEVICE_FORWARDER_PATH):

return

cmd = '%s %s --kill-server' % (tool.GetUtilWrapper(),

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