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: Add OfflinePageTestRunner.java to CL Created 4 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/rules.gni

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

index 35be87bd3d76bd25c55bcf65a4b5c27264f05b10..4ef8d9e6b2ae0497c537ec3324204b08d8247e04 100644

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

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

@@ -1122,13 +1122,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) {

« build/config/android/internal_rules.gni ('K') | « build/config/android/internal_rules.gni ('k') | chrome/android/BUILD.gn » ('j') | chrome/android/BUILD.gn » ('J')