Update Errorprone to 2.10.0 am: 9b1044a151 am: fd6fc31c9e am: a8c36ffadc am: 83dd0fb781

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1899634

Change-Id: I0844ca78313fbed31006276034e196a551d50959

27 files changed, 81 insertions, 87 deletions

diff --git a/Android.bp b/Android.bp
index 4de3662..24286e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@ license {
 java_import {
     name: "error_prone_annotations",
     host_supported: true,
-    jars: ["error_prone/error_prone_annotations-2.8.1.jar"],
+    jars: ["error_prone/error_prone_annotations-2.10.0.jar"],
     apex_available: [
         "//apex_available:anyapex",
         "//apex_available:platform",
@@ -62,8 +62,8 @@ java_import {
     jars: [
         "checkerframework/dataflow-errorprone-3.15.0.jar",
         "checkerframework/javacutil-3.15.0.jar",
-        "error_prone/error_prone_core-2.8.1-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.8.1.jar",
+        "error_prone/error_prone_core-2.10.0-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.10.0.jar",
         "javac/javac-9+181-r4173-1.jar",
         "jFormatString/jFormatString-3.0.0.jar",
     ],
@@ -73,7 +73,7 @@ java_import {
     name:  "error_prone_test_helpers",
     host_supported: true,
     jars: [
-        "error_prone/error_prone_test_helpers-2.8.1.jar",
+        "error_prone/error_prone_test_helpers-2.10.0.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/BUILD b/BUILD
index eeb2541..a619ba9 100644
--- a/BUILD
+++ b/BUILD
@@ -2,6 +2,6 @@
 
 java_import(
     name = "error_prone_annotations",
-    jars = ["error_prone/error_prone_annotations-2.8.1.jar"],
+    jars = ["error_prone/error_prone_annotations-2.10.0.jar"],
     visibility = ["//visibility:public"],
 )
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index bb2a793..c1adae1 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -18,5 +18,5 @@ third_party {
     value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
   }
   version: "3.15.0"
-  last_upgrade_date { year: 2021 month: 8 day: 18}
+  last_upgrade_date { year: 2021 month: 11 day: 22}
 }
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 7ce0737..98d6c0b 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,8 +10,8 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.8.1/error_prone_core-2.8.1-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.10.0/error_prone_core-2.10.0-with-dependencies.jar"
   }
-  version: "2.8.1"
-  last_upgrade_date { year: 2021 month: 8 day: 18}
+  version: "2.10.0"
+  last_upgrade_date { year: 2021 month: 11 day: 22}
 }
diff --git a/error_prone/error_prone_annotations-2.8.1.jar b/error_prone/error_prone_annotations-2.10.0.jar
index 106baea..2d1b543 100644
--- a/error_prone/error_prone_annotations-2.8.1.jar
+++ b/error_prone/error_prone_annotations-2.10.0.jar
diff --git a/error_prone/error_prone_annotations-2.10.0.jar.asc b/error_prone/error_prone_annotations-2.10.0.jar.asc
new file mode 100644
index 0000000..78d073c
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.10.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWnkACgkQmiWcfuY2
+xe0pfA/+MUtXSn6PgMDUSBvAPJeeG+ECu/2gRz8se+0H3wXkoUDiJqfsWEsKZ44E
+MrWuxfzzxiiLCseIMMuIQrs8GNKG51eKnc1WQH24HbbegXRPGj3TsukMoCKvV/9D
+KQgasZyORmxXAnbE1c/verjU6iq0ROot/ukeSWCk1fPsZPvo6HZXaEb7LabkZvCz
+4FtSdx6oTOtMswzxVZbXEKtg9sRPZ9Aa4Ll7tK1U0EJudLJJEfheyikMRaiC95l/
+iBVne+at5xaMwATxvjMre46xfXzc0WG3JxNgnbj/6beZHTIPW/ZUMNiDEK4c3KkZ
+T+yB5YUe/6ydhDoOICseXVYIeOrLt/HMt48RiJBlnaQy1MVbbUvByjuImnMQLyvL
+vCBIAhuSCHgPh7HUPdxsRaY40KnipdLodNIEk/0DQm/szC53UT+mQ1Qn+RiFp40l
+D+pQU9Fq8h5cQjias4TYnWFKWDNBK3j4BXe5S347pFXH2gaJoiKmw3+O6RtOl6tV
+TEqAVOfsLX6TnT1j7lUyFYuDIyp9wXDZN2ZAASYA4xU8Lwz3D37zkXGwYm3/T0vK
+eOMhkws5fZhh55dEydRq8GS5zs77pmylysoH33jNK5iJiYjR2FE68FymW/WLirDx
+a8l2iffbijjvMpyKgAc1dlgSvOjwdYk2EzEgWb75yD7IqtCn1xk=
+=BTNu
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.10.0.jar.sha1 b/error_prone/error_prone_annotations-2.10.0.jar.sha1
new file mode 100644
index 0000000..3706d9e
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.10.0.jar.sha1
@@ -0,0 +1 @@
+9bc20b94d3ac42489cf6ce1e42509c86f6f861a1
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.8.1.jar.asc b/error_prone/error_prone_annotations-2.8.1.jar.asc
deleted file mode 100644
index cde03d1..0000000
--- a/error_prone/error_prone_annotations-2.8.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlQ8ACgkQmiWcfuY2
-xe3oBhAAhrXJHf/gqz65a9Ol/Vo/yanBBvDRX3lwUEd3hPgd5FaTUOZIoRlJT4a+
-HMgbM02jNPNs3ZDKqkt8DG8jfpYTdIoNiDpD1wNDwuwmqrhztaGQ5KKS2imPcMSc
-Ub6oGwiFQV4ryEaMM8fB8Bc1+Ok+D2o7mPd2jnfUGFuQW3sWzLMEij4XktkudxUl
-eRWvfVFy2pwlcv1r91F1NC3JoCLBwXDc/Vd0GIlI/PC4HQouKrIvAxUOr1aj/qQK
-Dfq3VvKtqgGKdhzkFPd23P3u+dVK/pZ96LJYieVVfjO7BS0m75q9IoJVSBvUoNL7
-/+qS2TaIUONgHLvNq8jXG1XnfN5qewicKlYSLquYy33NDmsyyswvcEZLQugN9hHe
-MIHFjRvK6sn/OcSMHTgQ5bj0Uh7RQ0MxzsXMfV+qAhg5YxvsabPiOIAGU2FnaU3f
-B/OBF0/wsgiI2dCatZ+dU4U3SCgjU2KT6w+hItaLW+RSWgZlDtZrD824bWhwszun
-+Gr0cyuKzJjwsdc6UhcS7vqckQTv9BTdUhjrsdKE9k0GDk5J/tzJD8kTRtUfbYZh
-wDqFbTMVNAjfTaghhWTQdqPkv5iguJICIFPKQtQLrPaeHFBuOtqeDkdAAqqLtvYK
-c5rQ2k5ys7S6ZTy3OPdgR6sqhPGnbliUncK5VSIYRp8HnLUygXg=
-=8x6+
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_annotations-2.8.1.jar.sha1
deleted file mode 100644
index cb2b645..0000000
--- a/error_prone/error_prone_annotations-2.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbfa4bdfe7377126947f1469bc7b0bbb4d9dbb95
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar b/error_prone/error_prone_core-2.10.0-with-dependencies.jar
index b0ab3b1..b699d31 100644
--- a/error_prone/error_prone_core-2.8.1-with-dependencies.jar
+++ b/error_prone/error_prone_core-2.10.0-with-dependencies.jar
diff --git a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc
new file mode 100644
index 0000000..8f57314
--- /dev/null
+++ b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWvkACgkQmiWcfuY2
+xe1HsQ/9GKk1doZSSnW1JKcYZaFp4wyNV9CyD+FkNbn7f6YS7vcFk+fZfI9kTuxc
+VxSvW6fqfuLUnoxaSZ1ldKjuBF9N+ip4j81d5gdSemePs5UkAZN2GSSZaYDB27UA
+EjWWMn6bvbpzhohhgASyvLncDmFDiIQbGK2hUcopPaErdIVuNGBGgkvvFzniUvLJ
+QrvNMdmqXNciT9DynRt4/cJnerVMy2BbmEAVoqbLftpaj/mcNIUZaUWUaJDjAKmR
+jUkFRS+fF00fJ3vWY0hA42iO3Mg9huW8EROHQlidbBSwJYY09S1lHv4OxmeEOkxE
+cS2XJqQbXGvdyg2BwF2RSxlCUMeCuvAgs98EhJ9XufcznmRjZbO0qtmGa9BnB7t5
+cH1MjYyWUE+0AbVE9qVZMdijhux6IbupArbNTjcAJepmVEuEqpz6YMg0BydyLDAm
+nnM1kfoM6KR8KcpX2UvEYtiRPyr514S3qOsj/GTRhtVmzEzqAMMKTQq6i/savV2Y
+s9xMACm4QzFrIc1Wp+46axCX2WFwRsomw8qwrCXW8lcEHklhlf6IVlqouYx2sYZB
+t4jSXv1rKAGWN6Y3xX5682gBizuaiNI6TyzjzCX2jug+1JOws8+WTRe21FEcQEN0
+Pmbseow7s8EiBWumbdJ9PQFKkozfKMFCIgoZsSGDie+bJMYnYdM=
+=cxst
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1
new file mode 100644
index 0000000..df3054a
--- /dev/null
+++ b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+76fb795f4e20fe8dabc462e985dcdffd47a66381
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc
deleted file mode 100644
index 9a7d497..0000000
--- a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlZYACgkQmiWcfuY2
-xe3YHw/+Jf0H26yaSz/kqn7qv+nMP2BBz3d9SD44kLZFNKorsTeSHjgQ7VGDJ4bQ
-G+1bQVX5r2rB/OVQRKCNMoE8Jznnz9+tzEUNBhjvBykpUIrKN705BJGBegrOcAa2
-Nda42UYTMnGtdxc8VLb1iQB6eRS6yJNwgfoBvnTzHQiOh5gGdCvxjzSlyVN9pFUx
-0tkI6KUZvA3jiPOsZYvegkYbmmmm5JYkgp2BP5n6tU7wIm9MxetyBjbCk4mMVMst
-zXrhnVuqAtTp8LjCiJDzIneGyfXZ041Z/skcm4EwfFNga98NynP3gIB9Tp9J7GmX
-7sZKqEuPLyfI67J3pUKaDDc8HdTyKFVf7lBZvwf+w2TaUQkVAPyv95Ug+w6YbYvn
-LBcHq/cfRRhY/1EPBs/SK2gOnloVpcB1XKLJR+eTBF/GYGcUfuUqTUUkae7oc1gd
-GHbW6qi1SjhhtHswyKxkEJPLqNlLm46c5YqSwwk9Q3EsY2RkM0kXVLxlNg//MWrI
-RFubSY6WsPqPXIqAwQCrYAIffIbBanBMCi+YSstnKQp36SY6+xUeaVjbPv1AvmCI
-50/cW3Yl0oNnVbvT9Y+eiUD2R3W2ZF1lQYTLv1RsTTWvGWw3YKgaEQxQEkIUefds
-hkWwWklRR+nJHneMvDskFnyAx+7dKcN7y+ZGMechuTQ6FYRFIjc=
-=gvtA
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1
deleted file mode 100644
index b67c43c..0000000
--- a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e050e357440d8bb832183816c4f4fc8b2feeea26
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar b/error_prone/error_prone_test_helpers-2.10.0.jar
index 9771492..6da884d 100644
--- a/error_prone/error_prone_test_helpers-2.8.1.jar
+++ b/error_prone/error_prone_test_helpers-2.10.0.jar
diff --git a/error_prone/error_prone_test_helpers-2.10.0.jar.asc b/error_prone/error_prone_test_helpers-2.10.0.jar.asc
new file mode 100644
index 0000000..1297521
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.10.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWo8ACgkQmiWcfuY2
+xe1Xtg/9EgocMpsaCyVwWFstbgM2pAtaMEdJ3nOq79kpWr3kYP2iTyZAmrQ3Onoi
+D0PudSUgawtAsRaz2oYbiAzh3tKYBYMq7BkeLOXaQlIZjPJKAvMn7YrCKV7wdvJI
+BfYY2SW/tjM8n39lXW1pSE2IHaqNIf3elqFUGNbbVyJTyJuwwvMu+6AnZGZX8asD
+/6BAOLDuAdcipCTzOehn4vx50NBOE9ZVd8TpJKR4vqlZNhe3SxYYFzzfxKsrzSfC
+Ka/DTXQaKcKDi7l4Mwd30hhpJvs6e7b6+wF8zCc0xielEHr7Mn7cAL8bhy66sWzC
+hKYHEaKq2MzrR0tc6nJhaOdrS3DmjPstnMxt24RDSdbPlffHfItkSDos8/VVblIx
+JjpqKT507sGzl6IcoPe8mI3RHLZ3pxSsS653x4IXBrpriby0Ty5QL0ByxqZhgs+F
+wzEfmQcI3Gs01N+Vnji3npxIdjLse9qQisF4VZXiDVJo2/JEHd7LDf2VarnauX5B
+rfIYy/nB3LJBSle+eXaAkAQUxssTOVyKbALRWCk7hCTUgB7oUl7LhTWurcrUB6fk
+dZtXjwVlbCCjRnn7ePJgFI2ReFrSK+cjjheUIJrXK9uUl0U3kF1NQ7LSQlJg2FMg
+N8tm+yssvA6s48cCT9Pw9RVTNJmeivjZ2jTN1G16Za9UNkw9Gis=
+=6/17
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.10.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.10.0.jar.sha1
new file mode 100644
index 0000000..9fc415b
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.10.0.jar.sha1
@@ -0,0 +1 @@
+bb6d4128a55d8a737c02cf00cdbc9d00758d23be
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.asc b/error_prone/error_prone_test_helpers-2.8.1.jar.asc
deleted file mode 100644
index fbae2b3..0000000
--- a/error_prone/error_prone_test_helpers-2.8.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlSgACgkQmiWcfuY2
-xe3JfA//dDa2vy0XjV67wdGUa93SCxxmlhw45UxfguX8DG54+0T5SSHgv5oIJH+2
-Uynr9m9ZWlX4yXvUJ9FfRXZmGyzUK0A9SRV6eQQhqpfmqih/b92Sk2IDNJImhAcq
-BJQ6XWhyOEYoTB+NV5pgy3318JxLbF8NIUa1HGMjfCu9ZAQZmv+5W0+v+CehvLJU
-6/QW3Nwo/AlcPVr63u/CLanrmyZd5rNkMnJt0he4nMqfswqFY0Zi3YQjSWCu5raD
-4XT9KFeGz38RlpkCuCDAiQDLd2Mw/jtA0lw8oL7qIjrVNIzZ+oT7Nv7MV3wkvGWD
-P1bdeP+/L/E5hnNtOCSJPK3vdVvH7O1WB18RFVIyonzBFZVqIhYji/A5di+h3uRV
-bRQEXbw3eJLcMGUK3b4HIx2uIzEQxpVNDWViNSapPASUeaXSYEQWTW1dQPnJulOK
-ia7Vk6see4RQnX7A3OVXkCf8+q3ko5UZuTBV5M7a59QLiWH6ZyLpe7lJht/encXZ
-VrQKLokpFesqO+AxPsRgImaCCb94WkJi9ViHvBGlJz23bXsXGIbrWmlc/g0e3pRF
-CMlRSZpeX2jnoIcDkAjJB0s+2OWRI4XQUZjL7w4c/C1pR084lrdYQDe1OvGXsIQ9
-ycDqR9pti6l3ECf2epZTp5VOhXF2hhecWusAf8TepBx80DF9d7k=
-=91bf
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.sha1 b/error_prone/error_prone_test_helpers-2.8.1.jar.sha1
deleted file mode 100644
index 5705fc3..0000000
--- a/error_prone/error_prone_test_helpers-2.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9f1223156bdb02b7ffce3e1790c996d8f8fd368
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar b/error_prone/error_prone_type_annotations-2.10.0.jar
new file mode 100644
index 0000000..53bcba6
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.10.0.jar
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar.asc b/error_prone/error_prone_type_annotations-2.10.0.jar.asc
new file mode 100644
index 0000000..8539174
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.10.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWpMACgkQmiWcfuY2
+xe1xARAAs7uV4QEfo8isx0EqsfQgcLMv1xkNM4MVuQ2/mjiOMoU/EAPqLEDkAkRM
+0YGrU+TWydAQsPokzV07gr5g+fWEElBbfANmW+oPsjAkJkzHyufyXE1KrEaLmHQB
+jNXQqva70rZcP1fyCQIIr0sBBlqy6KQM6oz9KXalKjyBfSK9buR6u5BJRb31OZ7B
+hRj8JkM96hRuBopEaMicm3GyCfZ8IqsJQzoevPPPaqcTH2sWBOq6aGVnEDdjOSSB
+vLRLqsf9SFrekxMhqvi5W18FKPrT8tqQ3gbRyDbnfV413CK/9Qgegq+pV+Vjs0Vx
+N4Mg98PKZDa2YwOENKKmCP8DcZ8H0qxdZd9sGxG/pvNe32BlFEGPt3rTosJmz7bd
+eWZplKWERcipZWebY5ArNcroZ5+EJGg7kEG0j1PDnpNOL6Tl3SaPCSGxQbs1o6h4
+FWtgx/lUKgPgmf7Rm1wFfL7wSHwapzMetLr/i27bYpHdaBYmnfO+p5pe7DObjKpJ
+tBNubbHE+f6w007u3A5r07jzXayy1wA+0fZgjXqEXwLARuCb3gSIZ3yyE3RTYQY7
+qPT1AVdfjZI95vRn3WcOsfMa3neuFoTnjrs+6vMgusRYPWepX+oY9jUb9rrjVFe1
+2iBX26HmYFSCIAub115JN5EUY7iwJf3kDgyelBIB6MAEdQisxbc=
+=XCXI
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.10.0.jar.sha1
new file mode 100644
index 0000000..7298ad8
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.10.0.jar.sha1
@@ -0,0 +1 @@
+41396cadb7fe56349abb7c22df6983879a5a9f14
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar b/error_prone/error_prone_type_annotations-2.8.1.jar
deleted file mode 100644
index 9e1f977..0000000
--- a/error_prone/error_prone_type_annotations-2.8.1.jar
+++ /dev/null
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.asc b/error_prone/error_prone_type_annotations-2.8.1.jar.asc
deleted file mode 100644
index d63548d..0000000
--- a/error_prone/error_prone_type_annotations-2.8.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlS0ACgkQmiWcfuY2
-xe17LQ//Xo20fPWdOawZueraYBP0Etr9x1MP3guyfnNNfBX2y2+OsK6TeWMAc17k
-1nGxwe+GmVFYNxdBf3k08gBG6v3zRDiBbNb9EGz6Aq+WZGuAD0Wm5MMSPboYIvW8
-L3dhbSjrPiNmUaj9jt+BxlceYLAeWLlM7hUbjm3mZa7PZmCxePtsV3A5nLHyhsbw
-kfb4AzFOCteSQvw+PyrEhqbIqHL6HCR1VkQd0VE0s4epbaLMdA4e311fhv3Y9A2D
-S4ygjd5bkdmOLPTVTwZwxClcdjmFF6ccCFnU9doXrhHCHH4u1JcLc+W5JSpY8ED/
-7t6MPa18ZwXwCxHDUaONPmI6dYrAU/RiGwwgjnuKzBkJx4G6xiGAshJ3eAvR11/N
-hINti3l0TgldByzLnIl9NFOvAeeK2BkazzjptbA4JYv5d1avgyxwPX21TRCtvFcV
-8bWugfTFq9a/XszJHrnm4rJxwOxZyemJ3EgUHQ5ANj/+VzCOWFlDbb0WmTCdH25J
-Dp2gBgNhdRvVwQQsafBA+nZjBjetN9Z/F9/hR8aSgFpXpQ4nAv5PZxFrkSF1VmtY
-ZD2khBUSwtmCuRAMj7JrSuZgVSCO9nr4rT52TDf9Yfs4UBAipAvhi0wnqllHATMw
-9FTY1GpK576rGN/lW5/a9S4JRxrKRYjOd/JaZjvmpT5W0Q3/1Xk=
-=YFoe
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_type_annotations-2.8.1.jar.sha1
deleted file mode 100644
index 4c5b947..0000000
--- a/error_prone/error_prone_type_annotations-2.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b81c055c7ba1a109a67164b597c5c51f74c7671e
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index 9036623..3e8d3c2 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@ third_party {
     value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar"
   }
   version: "9+181-r4173-1"
-  last_upgrade_date { year: 2021 month: 8 day: 18}
+  last_upgrade_date { year: 2021 month: 11 day: 22}
 }
diff --git a/soong/error_prone.go b/soong/error_prone.go
index d3c4409..04507e9 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,9 +22,9 @@ func init() {
 	// These values are set into build/soong/java/config/config.go so that soong doesn't have any
 	// references to external/error_prone, which may not always exist.
 	config.ErrorProneClasspath = []string{
-		"external/error_prone/error_prone/error_prone_core-2.8.1-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.8.1.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.8.1.jar",
+		"external/error_prone/error_prone/error_prone_core-2.10.0-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.10.0.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.10.0.jar",
 		"external/error_prone/checkerframework/dataflow-errorprone-3.15.0.jar",
 		"external/error_prone/checkerframework/javacutil-3.15.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
@@ -62,7 +62,6 @@ func init() {
 		"-Xep:GuiceAssistedParameters:ERROR",
 		"-Xep:GuiceInjectOnFinalField:ERROR",
 		"-Xep:Immutable:ERROR",
-		"-Xep:ImmutableModification:ERROR",
 		"-Xep:IncompatibleArgumentType:ERROR",
 		"-Xep:IndexOfChar:ERROR",
 		"-Xep:InexactVarargsConditional:ERROR",
@@ -419,11 +418,6 @@ func init() {
 		// These checks crash
 		"-Xep:RethrowReflectiveOperationExceptionAsLinkageError:OFF",
 		"-Xep:InvalidLink:OFF",
-		// DoNotCall is a check with severity ERROR. Errorprone
-		// adds some hardcoded methods to be considered @DoNotCall,
-		// and they cause findings in external/junit. Disable this
-		// hardcoded list until we can exclude external code from errorprone.
-		"-XepOpt:DoNotCallChecker:CheckThirdPartyMethods=false",
 		// Commonly triggers for stubbed methods
 		"-Xep:DoNotCallSuggester:OFF",
 		"-Xep:MissingSummary:OFF",