build/android/test_runner.gypi - Issue 1237983004: Revert of Make instrumentation test dependency on a support APK explicit

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/test_runner.gypi

Issue 1237983004: Revert of Make instrumentation test dependency on a support APK explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/test_runner.gypi

diff --git a/build/android/test_runner.gypi b/build/android/test_runner.gypi

index f92b7cedc0e2cd4e0b75fdcb6d5f298b26b9ac90..92f355bf1fb4abe73d3480f728ac5f7ecfd7665b 100644

--- a/build/android/test_runner.gypi

+++ b/build/android/test_runner.gypi

@@ -33,7 +33,6 @@

'variables': {

'isolate_file%': '',

- 'support_apk_path%': '',

'test_runner_args': ['--output-directory', '<(PRODUCT_DIR)'],

'conditions': [

@@ -44,14 +43,6 @@

['test_type == "instrumentation"', {

'test_runner_args': ['--test-apk', '<(apk_name)'],

'script_name': 'run_<(_target_name)',

- 'conditions': [

- ['support_apk_path != ""', {

- 'test_runner_args': [

- '--support-apk',

- '<(support_apk_path)'

- ],

- }],

- ],

}],

['isolate_file != ""', {

'test_runner_args': ['--isolate-file-path', '<(isolate_file)']

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