diff options
| author | Alix <agespino@google.com> | 2023-11-01 16:06:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-01 16:06:45 +0000 |
| commit | f2b8ff6b6353f7c74678b70344b9800b9b426865 (patch) | |
| tree | 8f090c6e85515861dadf07133d70e7d829f38aad | |
| parent | 0c7cdfdbf62e9f84104f89b971273e3f0fef6cfe (diff) | |
| parent | dcbca4896405becf9eb720ae383641e530fb5c7f (diff) | |
| download | common-f2b8ff6b6353f7c74678b70344b9800b9b426865.tar.gz | |
Remove errorprone logic from update_tools.bzl am: dcbca48964
Original change: https://android-review.googlesource.com/c/platform/prebuilts/bazel/common/+/2805755
Change-Id: If755939ff652f4b058a1c9ad1a9862ced45f8651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | release_bazel.py | 1 | ||||
| -rwxr-xr-x | update.sh | 2 | ||||
| -rwxr-xr-x | update_tools.sh | 3 |
4 files changed, 2 insertions, 7 deletions
@@ -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" @@ -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 |