build/android/pylib/android_commands.py - Issue 926023002: [Android] Do not overwrite command when using the run_pie wrapper.

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/android_commands.py

Issue 926023002: [Android] Do not overwrite command when using the run_pie wrapper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/android_commands.py

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

index d6f9d326ba9c0d92b4a456e4c89a167ee8cac151..1ed1877e26a1b77c659e269879df0779564d1ad0 100644

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

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

@@ -694,8 +694,8 @@ class AndroidCommands(object):

assert os.path.exists(run_pie_dist_path), 'Please build run_pie'

# The PIE loader must be pushed manually (i.e. no PushIfNeeded) because

# PushIfNeeded requires md5sum and md5sum requires the wrapper as well.

- command = 'push %s %s' % (run_pie_dist_path, PIE_WRAPPER_PATH)

- assert _HasAdbPushSucceeded(self._adb.SendCommand(command))

+ adb_command = 'push %s %s' % (run_pie_dist_path, PIE_WRAPPER_PATH)

+ assert _HasAdbPushSucceeded(self._adb.SendCommand(adb_command))

self._pie_wrapper = PIE_WRAPPER_PATH

if self._pie_wrapper:

« no previous file with comments | « no previous file | no next file » | no next file with comments »