build/config/android/rules.gni - Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0

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/rules.gni

Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Convert newly added webapk_shell_apk_junit_tests to Robo 3.0 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

« build/android/pylib/junit/test_runner.py ('K') | « build/android/pylib/junit/test_runner.py ('k') | chrome/android/BUILD.gn » ('j') | chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/config/android/rules.gni

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

index d838ceb831571c18030020e1030e5c1d61f46746..45cedef5ad6c08b9bf9b2014e5f7e8558bc45156 100644

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

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

@@ -1123,13 +1123,17 @@ if (enable_java_templates) {

bypass_platform_checks = true

main_class = "org.chromium.testing.local.JunitTestMain"

wrapper_script_name = "helper/$target_name"

deps += [

"//testing/android/junit:junit_test_support",

"//third_party/junit",

"//third_party/mockito:mockito_java",

- "//third_party/robolectric:android-all-4.3_r2-robolectric-0",

+ "//third_party/robolectric:android-all-5.0.0_r2-robolectric-1",

+ "//third_party/robolectric:robolectric_annotations_java",

"//third_party/robolectric:robolectric_java",

+ "//third_party/robolectric:robolectric_resources_java",

+ "//third_party/robolectric:robolectric_utils_java",

+ "//third_party/robolectric:shadows-core-3.0-21",

+ "//third_party/robolectric:shadows-multidex-3.0",

]

}

group(target_name) {