build/config/android/internal_rules.gni - Issue 1208483004: 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/config/android/internal_rules.gni

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

Patch Set: Rebase 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/config/android/internal_rules.gni

diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni

index 630d0e69a22348632b9ea1d7e4f33886e0f46732..b069e666ab58ffca99b2d941700d68f9d723520b 100644

--- a/build/config/android/internal_rules.gni

+++ b/build/config/android/internal_rules.gni

@@ -1554,6 +1554,12 @@ template("test_runner_script") {

"--test-apk",

invoker.test_apk,

]

+ if (defined(invoker.support_apk_path)) {

+ test_runner_args += [

+ "--support-apk",

+ rebase_path(invoker.support_apk_path, root_build_dir),

+ ]

+ }

} else {

assert(false, "Invalid test type: $_test_type.")

}

« no previous file with comments | « build/android/test_runner.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »