Commit 6f8683e8 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot

Move robolectric to use android_dep target.

Bug: 1060721
Change-Id: I6fe5e9189fae6944859fbb3a99aa5c65c2d4f558
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218753Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772399}
parent 171ae7a0
...@@ -112,8 +112,8 @@ java_library("junit") { ...@@ -112,8 +112,8 @@ java_library("junit") {
deps = [ deps = [
":java", ":java",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
...@@ -16,9 +16,9 @@ java_library("components_autofill_junit_tests") { ...@@ -16,9 +16,9 @@ java_library("components_autofill_junit_tests") {
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//components/autofill/android:provider_java", "//components/autofill/android:provider_java",
"//content/public/android:content_java", "//content/public/android:content_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
} }
...@@ -131,9 +131,9 @@ if (is_android) { ...@@ -131,9 +131,9 @@ if (is_android) {
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//components/background_task_scheduler:public_java", "//components/background_task_scheduler:public_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
} }
...@@ -46,8 +46,8 @@ java_library("junit") { ...@@ -46,8 +46,8 @@ java_library("junit") {
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//base/test:test_support_java", "//base/test:test_support_java",
"//content/public/android:content_java", "//content/public/android:content_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
...@@ -286,8 +286,8 @@ java_library("junit") { ...@@ -286,8 +286,8 @@ java_library("junit") {
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//base/test:test_support_java", "//base/test:test_support_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
...@@ -256,8 +256,8 @@ java_library("components_embedder_support_junit_tests") { ...@@ -256,8 +256,8 @@ java_library("components_embedder_support_junit_tests") {
deps = [ deps = [
":util_java", ":util_java",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
......
...@@ -41,8 +41,8 @@ java_library("components_gcm_driver_junit_tests") { ...@@ -41,8 +41,8 @@ java_library("components_gcm_driver_junit_tests") {
"//base:base_java", "//base:base_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/hamcrest:hamcrest_java", "//third_party/hamcrest:hamcrest_java",
"//third_party/junit", "//third_party/junit",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
...@@ -140,9 +140,9 @@ java_library("components_permissions_junit_tests") { ...@@ -140,9 +140,9 @@ java_library("components_permissions_junit_tests") {
":java", ":java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
} }
......
...@@ -59,9 +59,9 @@ java_library("components_policy_junit_tests") { ...@@ -59,9 +59,9 @@ java_library("components_policy_junit_tests") {
"//base:base_java", "//base:base_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/hamcrest:hamcrest_java", "//third_party/hamcrest:hamcrest_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
...@@ -68,13 +68,13 @@ java_library("components_signin_junit_tests") { ...@@ -68,13 +68,13 @@ java_library("components_signin_junit_tests") {
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//testing/android/junit:junit_test_support", "//testing/android/junit:junit_test_support",
"//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/android_sdk:android_test_base_java", "//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java", "//third_party/android_support_test_runner:runner_java",
"//third_party/guava:guava_android_java", "//third_party/guava:guava_android_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
......
...@@ -28,9 +28,9 @@ java_library("components_variations_junit_tests") { ...@@ -28,9 +28,9 @@ java_library("components_variations_junit_tests") {
"//base:base_java", "//base:base_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//base:base_junit_test_support", "//base:base_junit_test_support",
"//third_party/android_deps:robolectric_all_java",
"//third_party/hamcrest:hamcrest_java", "//third_party/hamcrest:hamcrest_java",
"//third_party/junit", "//third_party/junit",
"//third_party/mockito:mockito_java", "//third_party/mockito:mockito_java",
"//third_party/robolectric:robolectric_all_java",
] ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment