Bazel 9 readiness: //adb

brotli is overridden to use an open PR: https://www.github.com/google/brotli/pull/1412

Bug: b/477396584

Author: Databean

.github/actions/bazel-9-readiness/action.yaml

@@ -44,6 +44,7 @@ runs:
       bazel aquery @libwebsockets//... > /dev/null
       bazel aquery @mako//... > /dev/null
       bazel aquery @markupsafe//... > /dev/null
+      bazel aquery //adb > /dev/null
       bazel aquery //android:log_header > /dev/null
       bazel aquery //libbase > /dev/null
       bazel aquery //linux_headers > /dev/null

base/cvd/MODULE.bazel

@@ -10,7 +10,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.19.3")
 bazel_dep(name = "aspect_rules_lint", version = "1.4.4", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.8.2", dev_dependency = True)
 bazel_dep(name = "boringssl", version = "0.20241024.0")
-bazel_dep(name = "brotli", version = "1.1.0")
+bazel_dep(name = "brotli")
 bazel_dep(name = "crc32c", version = "1.1.0")
 bazel_dep(name = "curl", version = "8.8.0.bcr.2")
 bazel_dep(name = "cxx.rs", version = "1.0.188")
@@ -40,6 +40,8 @@ bazel_dep(name = "protobuf", version = "31.1")
 bazel_dep(name = "rootcanal")
 bazel_dep(name = "rules_cc", version = "0.2.16")
 bazel_dep(name = "rules_flex", version = "0.4")
+# this is normally an indirect dependency, but for bazel 9 we need a higher version
+bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
 bazel_dep(name = "rules_license", version = "1.0.0")
 # this is normally an indirect dependency, but for bazel 9 we need a higher version
 bazel_dep(name = "rules_nodejs", version = "6.7.3")

base/cvd/adb/BUILD.bazel

@@ -1,4 +1,7 @@
+load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 load("//:build_variables.bzl", "COPTS")
 
 package(

base/cvd/build_external/brotli/BUILD.bazel

@@ -0,0 +1,6 @@
+git_override(
+    module_name = "brotli",
+    # https://github.com/google/brotli/pull/1412
+    commit = "e2bb23c8d9e00606ad274ec9efb4970c7402b469",
+    remote = "https://github.com/robinlinden/brotli",
+)

base/cvd/build_external/brotli/brotli.MODULE.bazel

@@ -3,6 +3,7 @@ include("//build_external/android_system_extras:android_system_extras.MODULE.baz
 include("//build_external/android_tools_netsim:android_tools_netsim.MODULE.bazel")
 include("//build_external/arm_optimized_routines:arm_optimized_routines.MODULE.bazel")
 include("//build_external/avb:avb.MODULE.bazel")
+include("//build_external/brotli:brotli.MODULE.bazel")
 include("//build_external/casimir:casimir.MODULE.bazel")
 include("//build_external/crosvm:crosvm.MODULE.bazel")
 include("//build_external/dosfstools:dosfstools.MODULE.bazel")