| commit | 02dec3f1a73ce316cfac12b4441a413a08b323ee | [log] [tgz] |
|---|---|---|
| author | Ben Joyce <[email protected]> | Wed Apr 15 16:52:23 2020 |
| committer | Commit Bot <[email protected]> | Wed Apr 15 16:52:23 2020 |
| tree | c83f9e514cb2a824bea42efc4d51580451862f09 | |
| parent | 89efdfcfda37f64f8120aaf46272291931e8462a [diff] [blame] |
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/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" ]