build/config/android/internal_rules.gni - Issue 2182303002: Merging under test java into instrumentation test java.

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 2182303002: Merging under test java into instrumentation test java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@runtimelibrary

Patch Set: reenabling tests that this fixes Created 4 years, 4 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 23641507f1931bdc7080f81384221baae789a915..c74402a7b27020ce6c7973ae3ea80b4e2e51cbb6 100644

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

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

@@ -817,7 +817,7 @@ if (enable_java_templates) {

rebase_path(depfile, root_build_dir),

"--output",

rebase_path(java_script, root_build_dir),

- "--classpath=@FileArg($_rebased_build_config:java:full_classpath)",

+ "--classpath=@FileArg($_rebased_build_config:deps_info:java:full_classpath)",

"--jar-path",

rebase_path(_jar_path, root_build_dir),

"--main-class",

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