Remove third_party/jsr_305.
Use third_party/android_deps/jsr_305 library instead.
This will prevent issues with androidx_espresso having duplicate javax
classes that conflict.
Must land after below CL:
https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/2880018
Bug: 1070424
Change-Id: I48fb52fc8136df2ed95860326105d9255e55e20e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149698
Reviewed-by: Yaron Friedman <[email protected]>
Commit-Queue: benjamin joyce <[email protected]>
Cr-Commit-Position: refs/heads/master@{#759295}
diff --git a/DEPS b/DEPS
index 72382ec8..89f267d9 100644
--- a/DEPS
+++ b/DEPS
@@ -1053,11 +1053,6 @@
Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git'
+ '@' + '645250b6690785be60ab6780ce4b58698d884d11', # release 1.9.1
- 'src/third_party/jsr-305/src': {
- 'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
- 'condition': 'checkout_android',
- },
-
'src/third_party/junit/src': {
'url': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
'condition': 'checkout_android',
diff --git a/base/BUILD.gn b/base/BUILD.gn
index e3a7751..7e2ccf6 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3282,7 +3282,7 @@
"//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:androidx_multidex_multidex_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
sources = [
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index c48169c..86b11128 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -472,7 +472,7 @@
"//base:base_java_test_support",
"//testing/android/native_test:native_main_runner_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
srcjar_deps = [ ":test_support_java_aidl" ]
sources = [
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 9e11344..c6283db 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -424,6 +424,7 @@
"//third_party/android_deps:androidx_viewpager_viewpager_java",
"//third_party/android_deps:com_android_support_interpolator_java",
"//third_party/android_deps:com_google_android_material_material_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_dagger_dagger_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
@@ -439,7 +440,6 @@
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
"//third_party/gif_player:gif_player_java",
"//third_party/google_android_play_core:com_google_android_play_core_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//ui/android:ui_java",
"//ui/base/mojom:mojom_java",
"//ui/gfx/geometry/mojom:mojom_java",
@@ -943,6 +943,7 @@
"//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:com_google_android_material_material_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
@@ -957,7 +958,6 @@
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/espresso:espresso_all_java",
"//third_party/hamcrest:hamcrest_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//third_party/ub-uiautomator:ub_uiautomator_java",
@@ -3018,9 +3018,9 @@
"//content/public/android:content_java",
"//content/public/test/android:android_test_message_pump_support_java",
"//content/public/test/android:content_java_test_support",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java",
diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni
index 1642c3b..020f7bb9 100644
--- a/chrome/android/feed/feed_java_sources.gni
+++ b/chrome/android/feed/feed_java_sources.gni
@@ -15,9 +15,9 @@
"//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
"//third_party/android_deps:com_android_support_interpolator_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
- "//third_party/jsr-305:jsr_305_javalib",
]
feed_java_sources = [
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
index 57f385f8..2f719810 100644
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -239,13 +239,13 @@
"//third_party/android_deps:com_android_support_appcompat_v7_java",
"//third_party/android_deps:com_android_support_support_fragment_java",
"//third_party/android_deps:com_google_android_material_material_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/espresso:espresso_all_java",
"//third_party/hamcrest:hamcrest_core_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
"//ui/android:ui_java",
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index ab936761..b63c099 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -326,7 +326,7 @@
":cronet_impl_java_util_java",
"//net/android:net_thread_stats_uid_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
}
@@ -401,7 +401,7 @@
":cronet_impl_common_base_java",
"//base:jni_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
deps += cronet_impl_native_java_deps_to_package
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -520,7 +520,7 @@
":package_impl_common_java",
":repackage_native",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
jar_excluded_patterns = [ "androidx/*/R*" ]
}
diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
index 53a76d9..9c499d7 100644
--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
@@ -13,8 +13,8 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_sdk:android_gcm_java",
- "//third_party/jsr-305:jsr_305_javalib",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
index 62fef1b..a061f21 100644
--- a/components/signin/core/browser/android/BUILD.gn
+++ b/components/signin/core/browser/android/BUILD.gn
@@ -76,9 +76,9 @@
"//base:base_java_test_support",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_test_monitor_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
]
@@ -92,7 +92,7 @@
"//base:base_java",
"//base:base_java_test_support",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/junit",
]
diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
index fba93d0a..4575d88 100644
--- a/components/sync/android/BUILD.gn
+++ b/components/sync/android/BUILD.gn
@@ -12,10 +12,10 @@
"//components/signin/core/browser/android:java",
"//net/android:net_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_sdk:android_gcm_java",
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
- "//third_party/jsr-305:jsr_305_javalib",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums" ]
@@ -43,10 +43,10 @@
"//components/signin/core/browser/android:java",
"//components/signin/core/browser/android:signin_java_test_support",
"//components/sync:sync_java_test_support",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
]
sources = [
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index 086b8c8c..c3fa46b 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -106,11 +106,11 @@
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:androidx_core_core_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/blink/public/mojom:mojom_core_java",
"//third_party/blink/public/mojom:mojom_platform_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//ui/android:ui_java",
"//ui/gfx/geometry/mojom:mojom_java",
"//url:gurl_java",
@@ -458,12 +458,12 @@
"//services/test/echo/public/mojom:mojom_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_collection_collection_java",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/hamcrest:hamcrest_java",
- "//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
"//ui/android:ui_java",
"//ui/android:ui_java_test_support",
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 3220fbb..6733e43 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -144,7 +144,7 @@
"//content/public/android:content_java",
"//media/capture/video/android:capture_java",
"//net/android:net_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//ui/android:ui_java",
]
diff --git a/net/android/BUILD.gn b/net/android/BUILD.gn
index fd5ad1c..a166ca55 100644
--- a/net/android/BUILD.gn
+++ b/net/android/BUILD.gn
@@ -33,7 +33,7 @@
"//base:base_java",
"//base:jni_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [
diff --git a/services/device/battery/android/BUILD.gn b/services/device/battery/android/BUILD.gn
index 6335d09..70ecdb1d 100644
--- a/services/device/battery/android/BUILD.gn
+++ b/services/device/battery/android/BUILD.gn
@@ -19,6 +19,6 @@
"//mojo/public/java:system_java",
"//services/device/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
- "//third_party/jsr-305:jsr_305_javalib",
+ "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
]
}
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
index f2dac11..7b4d05d 100644
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
@@ -53,8 +53,7 @@
# breaking when migrating to com_google_code_findbugs_jsr305. Can be
# removed once downstream bots move off of third_party/jsr_305.
java_group("com_google_code_findbugs_jsr305_java_temp") {
- deps = [ "//third_party/jsr-305:jsr_305_javalib" ]
- input_jars_paths = [ "libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar" ]
+ deps = [ ":com_google_code_findbugs_jsr305_java" ]
}
# TODO (bjoyce): Remove when downstream bots can call this directly.
diff --git a/third_party/jsr-305/BUILD.gn b/third_party/jsr-305/BUILD.gn
deleted file mode 100644
index 93b5b604..0000000
--- a/third_party/jsr-305/BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
-import("//build/config/android/rules.gni")
-
-java_library("jsr_305_javalib") {
- supports_android = true
- sources = [
- "src/ri/src/main/java/javax/annotation/CheckForNull.java",
- "src/ri/src/main/java/javax/annotation/CheckForSigned.java",
- "src/ri/src/main/java/javax/annotation/CheckReturnValue.java",
- "src/ri/src/main/java/javax/annotation/Detainted.java",
- "src/ri/src/main/java/javax/annotation/MatchesPattern.java",
- "src/ri/src/main/java/javax/annotation/Nonnegative.java",
- "src/ri/src/main/java/javax/annotation/Nonnull.java",
- "src/ri/src/main/java/javax/annotation/Nullable.java",
- "src/ri/src/main/java/javax/annotation/OverridingMethodsMustInvokeSuper.java",
- "src/ri/src/main/java/javax/annotation/ParametersAreNonnullByDefault.java",
- "src/ri/src/main/java/javax/annotation/ParametersAreNullableByDefault.java",
- "src/ri/src/main/java/javax/annotation/PropertyKey.java",
- "src/ri/src/main/java/javax/annotation/RegEx.java",
- "src/ri/src/main/java/javax/annotation/Signed.java",
- "src/ri/src/main/java/javax/annotation/Syntax.java",
- "src/ri/src/main/java/javax/annotation/Tainted.java",
- "src/ri/src/main/java/javax/annotation/Untainted.java",
- "src/ri/src/main/java/javax/annotation/WillClose.java",
- "src/ri/src/main/java/javax/annotation/WillCloseWhenClosed.java",
- "src/ri/src/main/java/javax/annotation/WillNotClose.java",
- "src/ri/src/main/java/javax/annotation/concurrent/GuardedBy.java",
- "src/ri/src/main/java/javax/annotation/concurrent/Immutable.java",
- "src/ri/src/main/java/javax/annotation/concurrent/NotThreadSafe.java",
- "src/ri/src/main/java/javax/annotation/concurrent/ThreadSafe.java",
- "src/ri/src/main/java/javax/annotation/meta/Exclusive.java",
- "src/ri/src/main/java/javax/annotation/meta/Exhaustive.java",
- "src/ri/src/main/java/javax/annotation/meta/TypeQualifier.java",
- "src/ri/src/main/java/javax/annotation/meta/TypeQualifierDefault.java",
- "src/ri/src/main/java/javax/annotation/meta/TypeQualifierNickname.java",
- "src/ri/src/main/java/javax/annotation/meta/TypeQualifierValidator.java",
- "src/ri/src/main/java/javax/annotation/meta/When.java",
- ]
-}
diff --git a/third_party/jsr-305/README.chromium b/third_party/jsr-305/README.chromium
deleted file mode 100644
index cecbc52..0000000
--- a/third_party/jsr-305/README.chromium
+++ /dev/null
@@ -1,16 +0,0 @@
-Name: JSR 305: Annotations for Software Defect Detection in Java
-Short Name: jsr-305
-URL: https://code.google.com/p/jsr-305/
-Version: r51
-License: BSD 2-Clause License
-License File: src/ri/LICENSE
-Security Critical: no
-
-Description:
-This project contains reference implementations, test cases, and other
-documents under source code control for Java Specification Request 305:
-Annotations for Software Defect Detection. More information at the Google
-group: http://groups.google.com/group/jsr-305
-
-Local Modifications:
-None.
diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
index 1b0c4032..212c59e 100644
--- a/third_party/robolectric/BUILD.gn
+++ b/third_party/robolectric/BUILD.gn
@@ -542,7 +542,7 @@
java_library("robolectric_shadowapi_java") {
skip_jetify = true
testonly = true
- deps = [ "//third_party/jsr-305:jsr_305_javalib" ]
+ deps = [ "//third_party/android_deps:com_google_code_findbugs_jsr305_java" ]
sources = [
"robolectric/shadowapi/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java",
