Merge QP1A.190404.001
Change-Id: I7c42300aaac97dbe36bcb4d9fa6ff292c920f24f
diff --git a/Android.bp b/Android.bp
index 825fe75..7f56cb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,4 +31,10 @@
],
}
+java_import {
+ name: "error_prone_test_helpers",
+ host_supported: true,
+ jars: ["error_prone/error_prone_test_helpers-2.3.2.jar"],
+}
+
subdirs = ["soong"]
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar b/error_prone/error_prone_test_helpers-2.3.2.jar
new file mode 100644
index 0000000..825b179
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.3.2.jar
Binary files differ
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.asc b/error_prone/error_prone_test_helpers-2.3.2.jar.asc
new file mode 100644
index 0000000..92213ce
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.3.2.jar.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9LagACgkQkS0sDsza
+VcBvTQwAoKDBdanv5a0mnSj/eGaODZXoq6KRkQmWAut1+Z1FlbwGLwEoB0D1wDsW
+oCqFvfp8gu1nZWh/VFH/JImqmPKdFW8rM0+EvNK3w+sh2gJEjL+bYJ8/SIwr2B8z
+i56NuDtXRIXTYXo7cLDMCg5sldqGwOnyZr/L9HkKS3ZD/FEI+a2fhTu9ety7EYI9
+bBNLKh+KMv7SBpRRuW6CTcNl17FV1lbMLRN+UKS2NZpKY7zWbJad9ANXLfNp5Cnu
+WPZbX9DZgIbktARdRjUpBihDiisqjkzrrQZciiPvTRHiyywG07dECDGMRR9xxuuD
+lsNFE7HL7eO/bJZKOSKazDFhten7SmxLQd8ieTtpNp9PS7VUnY7hGJjS/+1pzU5x
+E9WFmUrVFuyf06ZpXervn7h+myDMrO7ohB9clipT9In4LOlPvy8oviKQGx49BRMK
+mz194g/RlYOGWSl3Or98qndlQZcKFI4oN8zuMznDmfHvzKvNrfmCZ/UaOiRojfFM
+63am+Wz5
+=ZpSE
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.sha1 b/error_prone/error_prone_test_helpers-2.3.2.jar.sha1
new file mode 100644
index 0000000..966875d
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.3.2.jar.sha1
@@ -0,0 +1 @@
+f67ad60cdad7412996bf20559461f31745b9dfa8
\ No newline at end of file
diff --git a/update.sh b/update.sh
index 5bc68b0..20e8e85 100755
--- a/update.sh
+++ b/update.sh
@@ -17,6 +17,7 @@
EP_JAR_URL="${JAR_REPO}/error_prone_core/${EP_VERSION}/error_prone_core-${EP_VERSION}-with-dependencies.jar"
EP_ANNO_JAR_URL="${JAR_REPO}/error_prone_annotations/${EP_VERSION}/error_prone_annotations-${EP_VERSION}.jar"
EP_TYPE_ANNO_JAR_URL="${JAR_REPO}/error_prone_type_annotations/${EP_VERSION}/error_prone_type_annotations-${EP_VERSION}.jar"
+EP_TEST_HELPERS_JAR_URL="${JAR_REPO}/error_prone_test_helpers/${EP_VERSION}/error_prone_test_helpers-${EP_VERSION}.jar"
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="http://repo1.maven.org/maven2/org/checkerframework/dataflow/${CF_VERSION}/dataflow-${CF_VERSION}.jar"
@@ -47,6 +48,7 @@
update_jar "${EP_VERSION}" "${EP_JAR_URL}" "${TOOLS_DIR}/error_prone"
update_jar "${EP_VERSION}" "${EP_ANNO_JAR_URL}" "${TOOLS_DIR}/error_prone"
update_jar "${EP_VERSION}" "${EP_TYPE_ANNO_JAR_URL}" "${TOOLS_DIR}/error_prone"
+update_jar "${EP_VERSION}" "${EP_TEST_HELPERS_JAR_URL}" "${TOOLS_DIR}/error_prone"
update_jar "${JAVAC_VERSION}" "${JAVAC_SOURCES_JAR_URL}" "${TOOLS_DIR}/javac"
update_jar "${JAVAC_VERSION}" "${JAVAC_JAR_URL}" "${TOOLS_DIR}/javac"
@@ -56,6 +58,7 @@
s|\"(external/error_prone/error_prone/error_prone_core).*\"|\"\\1-${EP_VERSION}-with-dependencies.jar\"|;\
s|\"(external/error_prone/error_prone/error_prone_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
s|\"(external/error_prone/error_prone/error_prone_type_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
+ s|\"(external/error_prone/error_prone/error_prone_test_helpers).*\"|\"\\1-${EP_VERSION}.jar\"|;\
" "$TOOLS_DIR/soong/error_prone.go"
if [ "${CF_VERSION}" != '' ]; then