[Tool] Added Bazel 7 basic support (#35362)

- Added Bazel 7 to the support bazel versions. - Changed the default Bazel version to 7. - Fixed Android Binder build issue. Closes #35362 PiperOrigin-RevId: 592946781
grpc · Dec 21, 2023 · 45aecbe · 45aecbe
1 parent 594d370
commit 45aecbe
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -48,7 +48,7 @@ android_workspace()
 # be invoked by binder transport implementation through JNI.
 local_repository(
     name = "binder_transport_android_helper",
-    path = "./src/core/ext/transport/binder/java",
+    path = "src/core/ext/transport/binder/java",
 )
 
 # Prevents bazel's '...' expansion from including the following folder.

diff --git a/bazel/supported_versions.txt b/bazel/supported_versions.txt
@@ -1 +1,2 @@
 6.4.0
+7.0.0
diff --git a/bazel/update_mirror.sh b/bazel/update_mirror.sh
@@ -60,6 +60,9 @@ function upload {
 upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-linux-x86_64
 upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-darwin-x86_64
 upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-windows-x86_64.exe
 
 # Collect the github archives to mirror from grpc_deps.bzl
 grep -o '"https://github.com/[^"]*"' bazel/grpc_deps.bzl | sed 's/^"https:\/\///' | sed 's/"$//' | while read -r line ; do

diff --git a/doc/bazel_support.md b/doc/bazel_support.md
@@ -44,3 +44,4 @@ compatibility range. The currently supported versions are captured by the
 following list:
 
 - [`6.4.0`](https://github.com/bazelbuild/bazel/releases/tag/6.4.0)
+- [`7.0.0`](https://github.com/bazelbuild/bazel/releases/tag/7.0.0)
diff --git a/src/core/BUILD b/src/core/BUILD
@@ -33,7 +33,10 @@ package(
 # the top-level BUILD file that have not yet been moved here. Should go away
 # once the transition is complete.
 exports_files(
-    glob(["**"]),
+    glob(
+        ["**"],
+        exclude = ["ext/transport/binder/java/**"],
+    ),
     visibility = ["//:__subpackages__"],
 )
 

diff --git a/tools/bazelify_tests/test/supported_bazel_versions.bzl b/tools/bazelify_tests/test/supported_bazel_versions.bzl
@@ -18,4 +18,5 @@ This file is generated from the supported_bazel_versions.bzl.template
 
 SUPPORTED_BAZEL_VERSIONS = [
     "6.4.0",
+    "7.0.0",
 ]