Android: making JUnit depend on Android system SDK jars

Bug: 872904
Change-Id: Ia376f6beb1072d46189954decf7696cb980b4639
Reviewed-on: https://chromium-review.googlesource.com/c/1340364Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611236}

chrome/android/BUILD.gn

@@ -714,7 +714,6 @@ android_library("chrome_test_java") {
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/junit",
-    "//third_party/mockito:mockito_android_java",
     "//third_party/mockito:mockito_java",
     "//third_party/protobuf:protobuf_lite_javalib",
     "//third_party/ub-uiautomator:ub_uiautomator_java",

third_party/junit/BUILD.gn

@@ -4,12 +4,13 @@
 
 import("//build/config/android/rules.gni")
 
-java_library("junit") {
+android_library("junit") {
   chromium_code = false
   testonly = true
-  supports_android = true
   proguard_configs = [ "//third_party/junit/proguard.flags" ]
   deps = [
+    "//third_party/android_tools:android_test_base_java",
+    "//third_party/android_tools:android_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
   java_files = [
@@ -18,25 +19,11 @@ java_library("junit") {
     "src/src/main/java/junit/extensions/TestDecorator.java",
     "src/src/main/java/junit/extensions/TestSetup.java",
     "src/src/main/java/junit/extensions/package-info.java",
-    "src/src/main/java/junit/framework/Assert.java",
-    "src/src/main/java/junit/framework/AssertionFailedError.java",
     "src/src/main/java/junit/framework/ComparisonCompactor.java",
-    "src/src/main/java/junit/framework/ComparisonFailure.java",
     "src/src/main/java/junit/framework/JUnit4TestAdapter.java",
     "src/src/main/java/junit/framework/JUnit4TestAdapterCache.java",
     "src/src/main/java/junit/framework/JUnit4TestCaseFacade.java",
-    "src/src/main/java/junit/framework/Protectable.java",
-    "src/src/main/java/junit/framework/Test.java",
-    "src/src/main/java/junit/framework/TestCase.java",
-    "src/src/main/java/junit/framework/TestFailure.java",
-    "src/src/main/java/junit/framework/TestListener.java",
-    "src/src/main/java/junit/framework/TestResult.java",
-    "src/src/main/java/junit/framework/TestSuite.java",
     "src/src/main/java/junit/framework/package-info.java",
-    "src/src/main/java/junit/runner/BaseTestRunner.java",
-    "src/src/main/java/junit/runner/TestRunListener.java",
-    "src/src/main/java/junit/runner/Version.java",
-    "src/src/main/java/junit/runner/package-info.java",
     "src/src/main/java/junit/textui/ResultPrinter.java",
     "src/src/main/java/junit/textui/TestRunner.java",
     "src/src/main/java/junit/textui/package-info.java",

third_party/junit/README.chromium

@@ -6,5 +6,10 @@ License File: NOT_SHIPPED
 Security Critical: no
 License Android Compatible: yes
 Description: JUnit is a java unit testing library.
-Local Modifications: None
+Local Modifications:
+ - Removed the classes provided in android.test.base.jar and
+   android.test.runner.jar from the junit build target. To check which classes
+   are removed, run "unzip -l" on the jars (found in the SDK). Alternatively,
+   look at the classes listed on
+   https://developer.android.com/training/testing/set-up-project#junit-based-libs
 

third_party/mockito/BUILD.gn

@@ -7,9 +7,12 @@ import("//build/config/android/rules.gni")
 java_library("mockito_java") {
   chromium_code = false
   supports_android = true
+  requires_android = true
   testonly = true
+  proguard_configs = [ "//third_party/mockito/proguard.flags" ]
   deps = [
     "//third_party/byte_buddy:byte_buddy_agent_java",
+    "//third_party/byte_buddy:byte_buddy_android_java",
     "//third_party/byte_buddy:byte_buddy_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",
@@ -454,19 +457,6 @@ java_library("mockito_java") {
     "src/src/main/java/org/mockito/internal/creation/package-info.java",
     "src/src/main/java/org/mockito/creation/instance/InstantiationException.java",
     "src/src/main/java/org/mockito/creation/instance/Instantiator.java",
-  ]
-}
-
-android_library("mockito_android_java") {
-  chromium_code = false
-  testonly = true
-  proguard_configs = [ "//third_party/mockito/proguard.flags" ]
-  deps = [
-    ":mockito_java",
-    "//third_party/byte_buddy:byte_buddy_android_java",
-  ]
-
-  java_files = [
     "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java",
     "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidLoadingStrategy.java",
     "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidByteBuddyMockMaker.java",

third_party/robolectric/BUILD.gn

@@ -325,6 +325,7 @@ java_library("robolectric_sandbox_java") {
 }
 
 java_library("robolectric_junit_java") {
+  bypass_platform_checks = true
   testonly = true
   deps = [
     ":robolectric_annotations_java",