Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I34aab72dc94ef82be99b3665e792d9eee2a3fc73
Change-Id: Ia8d56d97c8c56c60694989c8c1300720cf4a2bb3
diff --git a/Android.bp b/Android.bp
index 7f02939..d7f9b99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,10 +12,44 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["external_error_prone_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+ name: "external_error_prone_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-CPL-1.0",
+ "SPDX-license-identifier-EPL",
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-GPL-2.0",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-MIT",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
java_import {
name: "error_prone_annotations",
host_supported: true,
- jars: ["error_prone/error_prone_annotations-2.3.2.jar"],
+ jars: ["error_prone/error_prone_annotations-2.4.0.jar"],
}
java_import {
@@ -25,7 +59,7 @@
"checkerframework/dataflow-2.5.3.jar",
"checkerframework/javacutil-2.5.3.jar",
"error_prone/error_prone_core-2.3.2-with-dependencies.jar",
- "error_prone/error_prone_annotations-2.3.2.jar",
+ "error_prone/error_prone_annotations-2.4.0.jar",
"javac/javac-9+181-r4173-1.jar",
"jFormatString/jFormatString-3.0.0.jar",
],
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 5fc825a..3c63920 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -17,5 +17,5 @@
value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.3.2/error_prone_core-2.3.2-with-dependencies.jar"
}
version: "2.3.2"
- last_upgrade_date { year: 2018 month: 10 day: 14}
+ last_upgrade_date { year: 2020 month: 11 day: 3}
}
diff --git a/error_prone/error_prone_annotations-2.3.2.jar b/error_prone/error_prone_annotations-2.3.2.jar
deleted file mode 100644
index bc2584d..0000000
--- a/error_prone/error_prone_annotations-2.3.2.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.3.2.jar.asc b/error_prone/error_prone_annotations-2.3.2.jar.asc
deleted file mode 100644
index 709f977..0000000
--- a/error_prone/error_prone_annotations-2.3.2.jar.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9LYEACgkQkS0sDsza
-VcDHUQwAtIpJzDuUWUpMdzSBYl+IkwtCZzlrNiUAl3o9wya9jANRE8ee51KPJ63f
-cQb/IqAZRCoRiCoDVKtiU3ik5H/VhUX4Bt8mRXJrTGPtnvnKJL0vMYzkI1oCQcHS
-c1tY/DSLbUOW7eyNVTiDCC1xVoWE093zmS5eELqypIbMwEMaqGrymfy+SADyiY5P
-ygwnfB8eAszITtT0vo9UJX9Tth4KeheorueUyJKaVMP+qAe2uG3h2/NNVsuRyUXB
-KO7O1w98jrjl7jSQIm0BO7z+3qKes4TPz4y6URyg/Z2Wtg1xpQ5Tr33EsZ4Hma+2
-6IGSGcfh3tP7Cu+htGpT954Q7sVbEmJGz920d2tszZG6RdHFIQPARQLgUYCQv8Ho
-DZbjJnrGwh7Wt2YADRW6sZTbcAcYjXf6mX6T8YD5RLe1Leo+llq1qzJdKoo1Th/B
-iFxNeUeqQ1NEC+GAwWYS2e4u7kIE9dKMwQ6LmDc+91IVvCEBKEptmc8XUCow7Nip
-hWcnmxJm
-=zlt/
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.3.2.jar.sha1 b/error_prone/error_prone_annotations-2.3.2.jar.sha1
deleted file mode 100644
index 4a158a2..0000000
--- a/error_prone/error_prone_annotations-2.3.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1a0c5032570e0f64be6b4d9c90cdeb103129029
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.4.0.jar b/error_prone/error_prone_annotations-2.4.0.jar
new file mode 100644
index 0000000..902c7b1
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.4.0.jar
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.4.0.jar.asc b/error_prone/error_prone_annotations-2.4.0.jar.asc
new file mode 100644
index 0000000..3ede198
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.4.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYZ4ACgkQmiWcfuY2
+xe2bABAApUalU975u4yqmvDhxxwv9OIZTEUlatLKO/Xz8vDzSoOtlIkRwkrIMqsL
+yYp49cIE8AbQcSXvkEaIZJ+DggqWm4gr4kNihqmDP4IQmURjQomLJt38FWty4AHE
+gK3LpeCud7QU2RvzHMgAxTkeZMsciibGjKqOGpNiAXhHvfHEpGiWEBXDhMeyvant
+cFqbSY7maYbITIk81vWXB5e2pYj3yoCmfCAuNj3LGXFjIkDbHiCK+XtDJWObKzut
+jPj/L2Xgv7zb5q7vRoZv50qMhwBF3jscqwpb8Pt/8NUn778OsRF1miKmMmWX3fny
+HxRVum5Ljt4o13QUbYA4fR64DSArsBAmdhHU+ELQzCpKINe68af2nlKuiobVv5N3
+dTS5a/ONUGU9hvHmjsrSZoYUaE+A53k9ieycuBhQZz1jh/pk9o+oBwjFtJvuPBpR
+Be7Fr/efA//SBcxNGP3XW4rLPXZc26gEqarYYPUk3NiKBIBZCS8s/QrfKdu9Oc1f
+BeVVTFJORQDgKFIxrHX9cCDj/r+VmSA9aKqRw5IV2t5jK1FWUuS/velvvpttULZW
+WhgS9igjFWW1K1Uig4FFX1u9i/3Y7rQuutXNODnO4Xhol5x+IPsycOduBxIZ41PU
+AOJdhxNlGg6nz3smk+hh6HjyaVo71WSymnVRMONAZv1PcfJqOrE=
+=TpCl
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_annotations-2.4.0.jar.sha1
new file mode 100644
index 0000000..23f0094
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.4.0.jar.sha1
@@ -0,0 +1 @@
+32ecccc595e4e4d813a80ee9e3ab5813d65874eb
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.3.2.jar b/error_prone/error_prone_type_annotations-2.3.2.jar
deleted file mode 100644
index 28cec6c..0000000
--- a/error_prone/error_prone_type_annotations-2.3.2.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.3.2.jar.asc b/error_prone/error_prone_type_annotations-2.3.2.jar.asc
deleted file mode 100644
index a5764a9..0000000
--- a/error_prone/error_prone_type_annotations-2.3.2.jar.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9LbAACgkQkS0sDsza
-VcBAHAv+Outf9D8BWlnTWH6GUI+32Q1Sn0QoF8rrnNDHeVd+we0BzryyNkqIwzpK
-iFEtNH/jCai42bLIhT5F5LL7Vh1ks1kBRpb15gpht+Ip1h+b3N07sdh2W9Ki1Qkp
-2JtmFGHia5XaEOIQE5gz2pBZgp95KfI05c1bbLSX14alVeB0ooNfXFaBVnu46DB1
-ne9Wtb+UCvz+y4kOv9w2+fnS8d33ZPNHRHk33xLc+z2G15LtyI4pmMbMTcmaClyG
-5BV3SLHYtP9H7v30eCsGyLmpS0ugN1vqJtjGR5MRWGLPAtnpPImobRwlEPkAIphD
-ND0mZX6yxda17U2QTdLCBY31jE2Tt72uy6/5s/D/ojs8tYoaQvfBlneXoe6qnHvu
-O8waQXVqD1GlOvXObnPGZas+iS/ahOUFo21MZ8l+0aoSp8Bkrw7NqsP7rF/AGrYG
-65G4+Z+c7vup2hkokzPBIy0AxVcfLLVAsA2CTZGrf62eq3fpBSZMwo+P2yBXb0fB
-+rhdgp68
-=uPdH
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.3.2.jar.sha1 b/error_prone/error_prone_type_annotations-2.3.2.jar.sha1
deleted file mode 100644
index 3b15aa9..0000000
--- a/error_prone/error_prone_type_annotations-2.3.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e79e88b9051888c8ea806f49c86fa7e3e3728180
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar b/error_prone/error_prone_type_annotations-2.4.0.jar
new file mode 100644
index 0000000..ce90baf
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.4.0.jar
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.asc b/error_prone/error_prone_type_annotations-2.4.0.jar.asc
new file mode 100644
index 0000000..a354c0e
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.4.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYdcACgkQmiWcfuY2
+xe3/ig//YBmI7uXHdG8Mej6oClbClD2oA1PXlc4OLcQ+uNrSJfvatEajIxylMvxD
++P2RBCj/9/1F8KCPy6+md5eRiQ+rvoAGCKxVBLlqEnXEQhA6BSMy45dA4m1xDuvs
+vyUc9ICFiZJ5qvxe4ENRKHliwjiG5wXbQj0ArKPvdZrhUhLDFTPmCV4LvrVBf5GG
+bg9Ek1EHTlMXIC4GI+hSX0wrH+D2H2rxlN7jhyaXXHs7hUpzheRRWw+W3DLFvgb2
+3zMzKPHQzeYEJK180V0BXOWWQew69PgNtdebK4khEYZQT2jvngpzZ/BIpRRBUG4c
+3mT0u9IoJiXAsZivz9pMuNktuCU3pCa8l3+gEQUkRFO/oAt/qT6o4iG9FPm1Uwe5
+agx6aA4Nhx6jDTw9jQXhcBT/yCagZvYdSQDWF0FBWwc8PHWCaQfXP+W+MSTXQo6l
+d+KtGz74fLTj19dFVy/m7GogTsGHy0awTK1bG24HFVLwpo/a91Yl+kCkxq5JgtGE
+Uw4MYB8X5+CX0PyvDjMR/cVvlg1QbRmduBCxGK2YqLjPmcRONu/Lipi5utrjPgjV
+oNtJ2RNc/MYoQsDmXYcGTJ8CiijWoWeqczasoqoL2QPrZ0bquHTFFutzxKCW8gfZ
+Vc7pNKZ8P/TDPKmBBuM4njp8E4O4i5xvT1tGT5HcK5tOCJvOlVQ=
+=bcXN
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.4.0.jar.sha1
new file mode 100644
index 0000000..c9c6d2a
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.4.0.jar.sha1
@@ -0,0 +1 @@
+101b970285e1e464d0c39e4402e2395c20c70a4f
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index 89c91dc..4cc6c75 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@
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: 2018 month: 10 day: 14}
+ last_upgrade_date { year: 2020 month: 11 day: 3}
}
diff --git a/soong/Android.bp b/soong/Android.bp
index 79fc457..f4110cf 100644
--- a/soong/Android.bp
+++ b/soong/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_error_prone_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_error_prone_license"],
+}
+
bootstrap_go_package {
name: "soong-java-config-error_prone",
pkgPath: "android/soong/java/config/error_prone",
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 31fd5aa..ef416f5 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -23,8 +23,8 @@
// references to external/error_prone, which may not always exist.
config.ErrorProneClasspath = []string{
"external/error_prone/error_prone/error_prone_core-2.3.2-with-dependencies.jar",
- "external/error_prone/error_prone/error_prone_annotations-2.3.2.jar",
- "external/error_prone/error_prone/error_prone_type_annotations-2.3.2.jar",
+ "external/error_prone/error_prone/error_prone_annotations-2.4.0.jar",
+ "external/error_prone/error_prone/error_prone_type_annotations-2.4.0.jar",
"external/error_prone/checkerframework/dataflow-2.5.3.jar",
"external/error_prone/checkerframework/javacutil-2.5.3.jar",
"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
