base/BUILD.gn - 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: base/BUILD.gn

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

« no previous file with comments | « no previous file | base/android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java » ('j') | base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/BUILD.gn

diff --git a/base/BUILD.gn b/base/BUILD.gn

index ddb9ab4c9ce1057de5988ef1efc9db585e18bf5b..b480eb468c08e920bd2b25fdf0bf8badc7cfb6bc 100644

--- a/base/BUILD.gn

+++ b/base/BUILD.gn

@@ -2365,20 +2365,6 @@ if (is_android) {

]

}

- # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull

mikecase (-- gone --) 2016/07/31 04:21:09 Switched to use the ShadowMultiDex from //third_pa

- # in the multidex shadow library. crbug.com/522043

- # GYP: //base.gyp:base_junit_test_support

- java_library("base_junit_test_support") {

- testonly = true

- java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java" ]

- deps = [

- "//third_party/android_tools:android_support_multidex_java",

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

- "//third_party/robolectric:robolectric_java",

- ]

- srcjar_deps = [ ":base_build_config_gen" ]

- }

# GYP: //base.gyp:base_junit_tests

junit_binary("base_junit_tests") {

java_files = [

@@ -2393,7 +2379,6 @@ if (is_android) {

deps = [

":base_java",

":base_java_test_support",

- ":base_junit_test_support",

]

}