From dcbca4896405becf9eb720ae383641e530fb5c7f Mon Sep 17 00:00:00 2001 From: Alix Date: Thu, 26 Oct 2023 15:56:11 +0000 Subject: Remove errorprone logic from update_tools.bzl Test: python prebuilts/bazel/common/release_bazel.py --commit current_bazel_release -f Change-Id: Iffeb0fbfd65e385a76e511d244dfa9b56160f7eb --- README.md | 3 +-- release_bazel.py | 1 - update.sh | 2 +- update_tools.sh | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 22acfd1..a70b63d 100644 --- a/README.md +++ b/README.md @@ -25,14 +25,13 @@ this will run `update.sh` which will also: - verify that the downloaded binary has the correct SHA-256 checksum as provided from Bazel CI metadata. -Once you have the binaries, you will need to create and send up to four CLs, +Once you have the binaries, you will need to create and send up to three CLs, to update the Linux, macOS, and platform-agnostic prebuilts that live in separate Git repositories, i.e. * https://android.googlesource.com/platform/prebuilts/bazel/linux-x86_64/ * https://android.googlesource.com/platform/prebuilts/bazel/darwin-x86_64/ * https://android.googlesource.com/platform/prebuilts/bazel/common/ -* https://android.googlesource.com/platform/build/bazel The update script does not automatically create CLs, so you need to create them manually. In each CL description, mention the testing you did, which should diff --git a/release_bazel.py b/release_bazel.py index f98ef6a..794a9fe 100755 --- a/release_bazel.py +++ b/release_bazel.py @@ -46,7 +46,6 @@ AFFECTED_PROJECT_DIRECTORIES: Final[list[str]] = [ "prebuilts/bazel/common", "prebuilts/bazel/linux-x86_64", "prebuilts/bazel/darwin-x86_64", - "build/bazel" ] MIXED_DROID_PATH: Final[str] = "build/bazel/ci/mixed_droid.sh" diff --git a/update.sh b/update.sh index 54101bc..5e513c6 100755 --- a/update.sh +++ b/update.sh @@ -88,4 +88,4 @@ download_and_verify "darwin" "${darwin_nojdk_url}" "${darwin_nojdk_sha256}" ${common_bazel_dir}/update_tools.sh "$linux_bazel_dir/$linux_downloaded_file" "$common_bazel_dir" "$linux_bazel_dir" "$bazel_src_dir" -echo "Done. This script may have affected all of build/bazel, prebuilts/bazel/common, prebuilts/bazel/linux-x86_64 and prebuilts/bazel/darwin-x86_64. Be sure to upload changes for all affected git repositories." +echo "Done. This script may have affected all of prebuilts/bazel/common, prebuilts/bazel/linux-x86_64 and prebuilts/bazel/darwin-x86_64. Be sure to upload changes for all affected git repositories." diff --git a/update_tools.sh b/update_tools.sh index 0467c7c..55d4dd6 100755 --- a/update_tools.sh +++ b/update_tools.sh @@ -60,9 +60,6 @@ for jar in "${common_jars[@]}" do unzip -o -d ${common_bazel_dir}/remote_java_tools java_tools.zip "java_tools/${jar}" done -# update errorprone default checks -root_dir=$(realpath "${common_bazel_dir}/../../..") -${root_dir}/build/bazel/rules/java/errorprone/errorProneCompatibilityFlags.sh ${root_dir} echo "downloading android_tools..." curl "${android_tools_url}" --output android_tools.tar -- cgit v1.2.3