Remove javacutil from errorprone

checkerframework/dataflow-errorprone-3.15.0.jar already contains a
shaded version of javacutil, the separate javacutil jar doesn't seem
to be necessary, remove it.

Test: m RUN_ERROR_PRONE=1 javac-check
Change-Id: I1cbd4847a659d0c51efcf014af66e2e09629ed25

9 files changed, 0 insertions, 31 deletions

diff --git a/Android.bp b/Android.bp
index de7abce..caf1c41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,7 +69,6 @@ java_import {
     host_supported: true,
     jars: [
         "checkerframework/dataflow-errorprone-3.15.0.jar",
-        "checkerframework/javacutil-3.15.0.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",
diff --git a/checkerframework/javacutil-3.15.0-sources.jar b/checkerframework/javacutil-3.15.0-sources.jar
deleted file mode 100644
index 564a49e..0000000
--- a/checkerframework/javacutil-3.15.0-sources.jar
+++ /dev/null
diff --git a/checkerframework/javacutil-3.15.0-sources.jar.asc b/checkerframework/javacutil-3.15.0-sources.jar.asc
deleted file mode 100644
index 45e2adc..0000000
--- a/checkerframework/javacutil-3.15.0-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4wGEIAKaN/1b7enYbrfsaZshrhpsA
-F+Hmi21YY3Cl0hVITcToHW0Sj3TzZ42mEFq1Z+S7uEbtHc1lICogMPOWefTXHbwm
-UHVI2iGNHgIumMzdgwngZPvQflKYVJs5N10gXpw74Bk+nQ+E41cZxvnIXurqDKj+
-QXLcE2j5VqE6VhNns8g1usbdZBwe5l9YUJ5R8z6pRolcg7sGitfymUs8kh2h4Arm
-hXelZ7Q86pzhSaUbyio5VH2lI7uCCybaEyxUZycWgPQ9GatJbS80JZ3hlZ4J67oq
-CrGy7tPxjQ1NkAB85wPjeRfyrfavP60FCn6ELyR7LR9qU1taB8F8QcwBX0jgrgc=
-=ONLI
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.15.0-sources.jar.sha1 b/checkerframework/javacutil-3.15.0-sources.jar.sha1
deleted file mode 100644
index 482bd0a..0000000
--- a/checkerframework/javacutil-3.15.0-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba716714cb8fe068fbaab8e87c8d6c62f10d3777
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.15.0.jar b/checkerframework/javacutil-3.15.0.jar
deleted file mode 100644
index 601ca3d..0000000
--- a/checkerframework/javacutil-3.15.0.jar
+++ /dev/null
diff --git a/checkerframework/javacutil-3.15.0.jar.asc b/checkerframework/javacutil-3.15.0.jar.asc
deleted file mode 100644
index 26a21a3..0000000
--- a/checkerframework/javacutil-3.15.0.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4V2UIAJr9s2wBkWrf6x03MlTOs87j
-iZSSaWXVpbZiu/ZDBVCoZiW6NgE5N0E7rbgCqb2HFNXvfLt3sD9JcENVpilGBnVE
-slIStEfhZAdzOMlGGBFsiKbzqjHxUMtdk69/MVlaYFpbNxRWakA6I+ORwouN2AXC
-1tzBSqN8QOgaSenN6JSdAVd8mf4ctiBXqntG2+zE49CjxD31W945TG3o2fm493ph
-8VxnM/h1ZMaBYboG5o+ERt06kg13djOAWgqCo10at3lSQlUqMZg+oZODUtJ22kBv
-gdBCHAwGdTaK46UZXjpxichVmGs9urrICjlAXy9T3qc5/ZzGY18i9xITcqr1fXg=
-=BSMt
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.15.0.jar.sha1 b/checkerframework/javacutil-3.15.0.jar.sha1
deleted file mode 100644
index 8ed9c68..0000000
--- a/checkerframework/javacutil-3.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bab34878391ed9af57cfa3dbfa56082e89d25b1
\ No newline at end of file
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 04507e9..627d877 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -26,7 +26,6 @@ func init() {
 		"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",
 	}
 
diff --git a/update.sh b/update.sh
index c5c4af9..c577710 100755
--- a/update.sh
+++ b/update.sh
@@ -22,8 +22,6 @@ JAVAC_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}.jar"
 JAVAC_SOURCES_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}-sources.jar"
 CF_DATAFLOW_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}.jar"
 CF_DATAFLOW_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}-sources.jar"
-CF_JAVACUTIL_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar"
-CF_JAVACUTIL_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar"
 TOOLS_DIR=$(dirname $0)
 
 function update_jar {
@@ -65,10 +63,7 @@ if [ "${CF_VERSION}" != '' ]; then
   rm -f checkerframework/*.jar*
   update_jar "${CF_VERSION}" "${CF_DATAFLOW_JAR_URL}" "${TOOLS_DIR}/checkerframework"
   update_jar "${CF_VERSION}" "${CF_DATAFLOW_SOURCES_JAR_URL}" "${TOOLS_DIR}/checkerframework"
-  update_jar "${CF_VERSION}" "${CF_JAVACUTIL_JAR_URL}" "${TOOLS_DIR}/checkerframework"
-  update_jar "${CF_VERSION}" "${CF_JAVACUTIL_SOURCES_JAR_URL}" "${TOOLS_DIR}/checkerframework"
   perl -pi -e "\
     s|\"(external/error_prone/checkerframework/dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;\
-    s|\"(external/error_prone/checkerframework/javacutil).*\"|\"\\1-${CF_VERSION}.jar\"|;\
   " "$TOOLS_DIR/soong/error_prone.go"
 fi