summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Kudasov <kudasov@google.com>2022-02-15 09:31:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-15 09:31:00 +0000
commit862aac1b16ca401f262da0503d1eff9405d90f04 (patch)
tree36845d0e3b7b74fa78bdac0638f156c78d49e302
parent7752d893f782dc4f8dc43f349b37f221d64afb96 (diff)
parent5ac3e14ed20718389ca6684a49eda35d26f7f129 (diff)
downloaderror_prone-862aac1b16ca401f262da0503d1eff9405d90f04.tar.gz
Make update script change dataflow version am: 4a27566ba4 am: 5ac3e14ed2
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1984992 Change-Id: I41b78ad04c8ed66540fa10ec806607ac411ee739
-rwxr-xr-xupdate.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/update.sh b/update.sh
index c577710..db399d5 100755
--- a/update.sh
+++ b/update.sh
@@ -50,6 +50,15 @@ update_jar "${EP_VERSION}" "${EP_TEST_HELPERS_JAR_URL}" "${TOOLS_DIR}/error_pron
update_jar "${JAVAC_VERSION}" "${JAVAC_SOURCES_JAR_URL}" "${TOOLS_DIR}/javac"
update_jar "${JAVAC_VERSION}" "${JAVAC_JAR_URL}" "${TOOLS_DIR}/javac"
+# Update the versions in the build file
+perl -pi -e "\
+ s|\"(javac/javac).*\"|\"\\1-${JAVAC_VERSION}.jar\"|;\
+ s|\"(error_prone/error_prone_core).*\"|\"\\1-${EP_VERSION}-with-dependencies.jar\"|;\
+ s|\"(error_prone/error_prone_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
+ s|\"(error_prone/error_prone_type_annotations).*\"|\"\\1-${EP_VERSION}.jar\"|;\
+ s|\"(error_prone/error_prone_test_helpers).*\"|\"\\1-${EP_VERSION}.jar\"|;\
+" "$TOOLS_DIR/Android.bp"
+
# Update the versions for soong
perl -pi -e "\
s|\"(external/error_prone/javac/javac).*\"|\"\\1-${JAVAC_VERSION}.jar\"|;\
@@ -66,4 +75,5 @@ if [ "${CF_VERSION}" != '' ]; then
perl -pi -e "\
s|\"(external/error_prone/checkerframework/dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;\
" "$TOOLS_DIR/soong/error_prone.go"
+ perl -pi -e "s|\"(dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;" "${TOOLS_DIR}/checkerframework/Android.bp"
fi