build/android/pylib/instrumentation/setup.py - Issue 1564583003: [Android] Add APK under test and additional APK support for the old mode.

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 1564583003: [Android] Add APK under test and additional APK support for the old mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/instrumentation/setup.py

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

index ceaab042aa1ff788d64cfd9c91661d6835aebcfc..b40137114e3eb621cd3ee11a3c56d0148c82304f 100644

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

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

@@ -75,9 +75,12 @@ def Setup(test_options, devices):

os.path.exists(test_options.coverage_dir)):

os.makedirs(test_options.coverage_dir)

- test_pkg = test_package.TestPackage(test_options.test_apk_path,

- test_options.test_apk_jar_path,

- test_options.test_support_apk_path)

+ test_pkg = test_package.TestPackage(

+ test_options.test_apk_path,

+ test_options.test_apk_jar_path,

+ test_options.test_support_apk_path,

+ additional_apks=test_options.additional_apks,

+ apk_under_test=test_options.apk_under_test)

tests = test_pkg.GetAllMatchingTests(

test_options.annotations,

test_options.exclude_annotations,

« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_options.py » ('j') | no next file with comments »