build/android/pylib/instrumentation/setup.py - Issue 886993003: Revert #315148 "[Android] Convert ContentShellTest.apk to isolate."

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/instrumentation/setup.py

Issue 886993003: Revert #315148 "[Android] Convert ContentShellTest.apk to isolate." (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

« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java ('k') | content/content_shell_test_apk.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/setup.py

diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py

index bdde80d54bafdc26d266d133aa77ead23823cb80..8dacc3d18dc8c3866b96482ef9907a917fac9d99 100644

--- a/build/android/pylib/instrumentation/setup.py

+++ b/build/android/pylib/instrumentation/setup.py

@@ -89,15 +89,15 @@ def Setup(test_options, devices):

if test_options.test_data:

device_utils.DeviceUtils.parallel(devices).pMap(

_PushDataDeps, test_options)

- if test_options.isolate_file_path:

+ else:

base_setup.GenerateDepsDirUsingIsolate(test_options.test_apk,

test_options.isolate_file_path,

ISOLATE_FILE_PATHS,

DEPS_EXCLUSION_LIST)

def push_data_deps_to_device_dir(device):

- base_setup.PushDataDeps(device, device.GetExternalStoragePath(),

- test_options)

+ device_dir = os.path.join(device.GetExternalStoragePath(),

+ DEVICE_DATA_DIR)

+ base_setup.PushDataDeps(device, device_dir, test_options)

device_utils.DeviceUtils.parallel(devices).pMap(

push_data_deps_to_device_dir)