Support building //cuttlefish/package:cvd with bazel 9

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

@@ -14,54 +14,10 @@ runs:
   - name: Install bazel
     run: sudo tools/buildutils/installbazel.sh
     shell: bash
-  - name: Run unit tests
+  - name: Test whether package can build
     working-directory: base/cvd
     env:
       OVERRIDE_BAZEL_VERSION: 9.0.0
     run: |
-      bazel aquery @android_system_core//... > /dev/null
-      bazel aquery @android_system_extras//... > /dev/null
-      bazel aquery @arm_optimized_routines//... > /dev/null
-      bazel aquery @avb//... > /dev/null
-      bazel aquery @dosfstools//... > /dev/null
-      bazel aquery @e2fsprogs//... > /dev/null
-      bazel aquery @egl_headers//... > /dev/null
-      bazel aquery @expat//... > /dev/null
-      bazel aquery @f2fs_tools//... > /dev/null
-      bazel aquery @fec_rs//... > /dev/null
-      bazel aquery @fruit//:fruit > /dev/null
-      bazel aquery @libcbor//:cbor > /dev/null
-      bazel aquery @libconfig//... > /dev/null
-      bazel aquery @libeigen//... > /dev/null
-      bazel aquery @libffi//... > /dev/null
-      bazel aquery @libnl//... > /dev/null
-      bazel aquery @libopenscreen//... > /dev/null
-      bazel aquery @libpffft//... > /dev/null
-      bazel aquery @libsrtp2//... > /dev/null
-      bazel aquery @libusb//... > /dev/null
-      bazel aquery @libvpx//... > /dev/null
-      bazel aquery @libwebm//... > /dev/null
-      bazel aquery @libwebrtc//... > /dev/null
-      bazel aquery @libwebsockets//... > /dev/null
-      bazel aquery @libyuv//:libyuv > /dev/null
-      bazel aquery @mako//... > /dev/null
-      bazel aquery @mesa//... > /dev/null
-      bazel aquery @markupsafe//... > /dev/null
-      bazel aquery @mkbootimg//... > /dev/null
-      bazel aquery @ms-tpm-20-ref//... > /dev/null
-      bazel aquery @mtools//... > /dev/null
-      bazel aquery @opengl_headers//... > /dev/null
-      bazel aquery @pyyaml//... > /dev/null
-      bazel aquery @spirv_headers//... > /dev/null
-      bazel aquery @spirv_tools//:spirv_tools_opt > /dev/null
-      bazel aquery @vulkan_headers//... > /dev/null
-      bazel aquery @wayland//... > /dev/null
-      bazel aquery //adb > /dev/null
-      bazel aquery //android:log_header > /dev/null
-      bazel aquery //external_proto/... > /dev/null
-      bazel aquery //fastboot/... > /dev/null
-      bazel aquery //fec/... > /dev/null
-      bazel aquery //libbase > /dev/null
-      bazel aquery //linux_headers > /dev/null
-      bazel aquery //teeui/... > /dev/null
+      bazel build --nobuild //cuttlefish/package:cvd
     shell: bash

base/cvd/MODULE.bazel

@@ -12,24 +12,24 @@ bazel_dep(name = "bazel_skylib", version = "1.8.2", dev_dependency = True)
 bazel_dep(name = "boringssl", version = "0.20241024.0")
 bazel_dep(name = "brotli")
 bazel_dep(name = "crc32c")
-bazel_dep(name = "curl", version = "8.8.0.bcr.2")
+bazel_dep(name = "curl")
 bazel_dep(name = "cxx.rs", version = "1.0.194")
 bazel_dep(name = "fmt", version = "11.2.0.bcr.1")
 bazel_dep(name = "freetype", version = "2.13.3.bcr.2")
-bazel_dep(name = "gflags", version = "2.2.2")
+bazel_dep(name = "gflags")
 bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1")
 bazel_dep(name = "googleapis-cc", version = "1.0.0")
 bazel_dep(name = "googletest")
-bazel_dep(name = "grpc", version = "1.71.0")
-bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58")
+bazel_dep(name = "grpc")
+bazel_dep(name = "grpc-proto")
 bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 bazel_dep(name = "icu", version = "76.1.bcr.1")
-bazel_dep(name = "jsoncpp", version = "1.9.6")
+bazel_dep(name = "jsoncpp")
 bazel_dep(name = "libarchive", version = "3.7.9")
 bazel_dep(name = "libevent", version = "2.1.12-stable.bcr.0")
-bazel_dep(name = "libjpeg_turbo", version = "2.1.91")
+bazel_dep(name = "libjpeg_turbo")
 bazel_dep(name = "libpng", version = "1.6.47.bcr.1")
-bazel_dep(name = "libuuid", version = "2.39.3.bcr.1")
+bazel_dep(name = "libuuid")
 bazel_dep(name = "libxml2", version = "2.13.5")
 bazel_dep(name = "libzip", version = "1.10.1")
 bazel_dep(name = "lz4", version = "1.9.4.bcr.2")
@@ -42,6 +42,7 @@ 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_java", version = "7.12.2")
 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/allocd/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(
     default_visibility = ["//:android_cuttlefish"],

base/cvd/build_external/android_tools_netsim/android_tools_netsim.MODULE.bazel

@@ -17,6 +17,7 @@ netsim_crates.annotation(
         "BINDING_PATH": "$(execpath bindings/bindings.rs)",
     },
     additive_build_file_content = """
+load("@rules_cc//cc:defs.bzl", "cc_library")
 
 cc_library(
     name = "grpc_wrap",

base/cvd/build_external/android_tools_netsim/openssl_sys.bzl

@@ -13,6 +13,7 @@ def _openssl_sys_env_impl(ctx):
                 libs.append(library.pic_static_library)
 
         compilation_context = src[CcInfo].compilation_context
+        all_include_directories_depsets.append(compilation_context.includes)
         all_include_directories_depsets.append(compilation_context.system_includes)
         headers_depsets.append(compilation_context.headers)
 

base/cvd/build_external/build_external.MODULE.bazel

@@ -4,29 +4,38 @@ 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/bzip2:bzip2.MODULE.bazel")
+include("//build_external/c-ares:c-ares.MODULE.bazel")
 include("//build_external/casimir:casimir.MODULE.bazel")
 include("//build_external/crc32c:crc32c.MODULE.bazel")
+include("//build_external/curl:curl.MODULE.bazel")
 include("//build_external/crosvm:crosvm.MODULE.bazel")
 include("//build_external/dosfstools:dosfstools.MODULE.bazel")
 include("//build_external/e2fsprogs:e2fsprogs.MODULE.bazel")
 include("//build_external/egl_headers:egl_headers.MODULE.bazel")
 include("//build_external/expat:expat.MODULE.bazel")
 include("//build_external/f2fs_tools:f2fs_tools.MODULE.bazel")
 include("//build_external/fec_rs:fec_rs.MODULE.bazel")
+include("//build_external/gflags:gflags.MODULE.bazel")
 include("//build_external/fruit:fruit.MODULE.bazel")
 include("//build_external/gfxstream:gfxstream.MODULE.bazel")
 include("//build_external/googletest:googletest.MODULE.bazel")
+include("//build_external/grpc:grpc.MODULE.bazel")
+include("//build_external/grpc-proto:grpc-proto.MODULE.bazel")
 include("//build_external/hedron_compile_commands:hedron_compile_commands.MODULE.bazel")
+include("//build_external/jsoncpp:jsoncpp.MODULE.bazel")
 include("//build_external/libcbor:libcbor.MODULE.bazel")
 include("//build_external/libconfig:libconfig.MODULE.bazel")
 include("//build_external/libdrm:libdrm.MODULE.bazel")
 include("//build_external/libeigen:libeigen.MODULE.bazel")
 include("//build_external/libffi:libffi.MODULE.bazel")
+include("//build_external/libjpeg_turbo:libjpeg_turbo.MODULE.bazel")
 include("//build_external/libnl:libnl.MODULE.bazel")
 include("//build_external/libopenscreen:libopenscreen.MODULE.bazel")
 include("//build_external/libpffft:libpffft.MODULE.bazel")
 include("//build_external/libsrtp2:libsrtp2.MODULE.bazel")
 include("//build_external/libusb:libusb.MODULE.bazel")
+include("//build_external/libuuid:libuuid.MODULE.bazel")
 include("//build_external/libvpx:libvpx.MODULE.bazel")
 include("//build_external/libwebm:libwebm.MODULE.bazel")
 include("//build_external/libwebrtc:libwebrtc.MODULE.bazel")
@@ -40,7 +49,9 @@ include("//build_external/ms-tpm-20-ref:ms-tpm-20-ref.MODULE.bazel")
 include("//build_external/mtools:mtools.MODULE.bazel")
 include("//build_external/opengl_headers:opengl_headers.MODULE.bazel")
 include("//build_external/pyyaml:pyyaml.MODULE.bazel")
+include("//build_external/re2:re2.MODULE.bazel")
 include("//build_external/rootcanal:rootcanal.MODULE.bazel")
+include("//build_external/rules_m4:rules_m4.MODULE.bazel")
 include("//build_external/sandboxed_api:sandboxed_api.MODULE.bazel")
 include("//build_external/selinux:selinux.MODULE.bazel")
 include("//build_external/spirv_headers:spirv_headers.MODULE.bazel")
@@ -49,3 +60,4 @@ include("//build_external/swiftshader:swiftshader.MODULE.bazel")
 include("//build_external/vulkan_headers:vulkan_headers.MODULE.bazel")
 include("//build_external/wayland:wayland.MODULE.bazel")
 include("//build_external/wmediumd:wmediumd.MODULE.bazel")
+include("//build_external/xz:xz.MODULE.bazel")

base/cvd/build_external/bzip2/bazel9.patch

@@ -0,0 +1,20 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index d920390..44c9b13 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -1,3 +1,5 @@
++load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
++
+ cc_binary(
+     name = "bzip2",
+     srcs = ["bzip2.c"],
+diff --git a/MODULE.bazel b/MODULE.bazel
+index d81a5d6..f9e1e8b 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -3,3 +3,5 @@ module(
+     version = "1.0.8.bcr.1",
+     compatibility_level = 1,
+ )
++
++bazel_dep(name = "rules_cc", version = "0.0.9")

base/cvd/build_external/bzip2/bzip2.MODULE.bazel

@@ -0,0 +1,6 @@
+single_version_override(
+    module_name = "bzip2",
+    version = "1.0.8.bcr.1",
+    patch_strip = 1,
+    patches = ["@//build_external/bzip2:bazel9.patch"],
+)

base/cvd/build_external/c-ares/bazel9.patch

@@ -0,0 +1,23 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index d920390..44c9b13 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -1,3 +1,4 @@
++load("@rules_cc//cc:defs.bzl", "cc_library")
+ load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
+
+ config_setting(
+diff --git a/MODULE.bazel b/MODULE.bazel
+index d81a5d6..f9e1e8b 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -1,8 +1,9 @@
+ module(
+     name = "c-ares",
+     version = "1.19.1",
+     bazel_compatibility = [">=7.2.1"],
+     compatibility_level = 1,
+ )
+ bazel_dep(name = "bazel_skylib", version = "1.0.3")
+ bazel_dep(name = "platforms", version = "0.0.4")
++bazel_dep(name = "rules_cc", version = "0.0.9")

base/cvd/build_external/c-ares/c-ares.MODULE.bazel

@@ -0,0 +1,6 @@
+single_version_override(
+    module_name = "c-ares",
+    version = "1.19.1",
+    patch_strip = 1,
+    patches = ["@//build_external/c-ares:bazel9.patch"],
+)

base/cvd/build_external/casimir/casimir.MODULE.bazel

@@ -1,4 +1,11 @@
 casimir_crates = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
+casimir_crates.annotation(
+    crate = "grpcio-sys",
+    version = "0.13.0",
+    additive_build_file_content = """
+load("@rules_cc//cc:defs.bzl", "cc_library")
+""",
+)
 casimir_crates.from_cargo(
     name = "casimir_crates",
     manifests = [

base/cvd/build_external/crosvm/BUILD.crosvm.bazel

@@ -1,3 +1,6 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_python//python:defs.bzl", "py_binary")
+
 package(
     default_visibility = [
         "@//:android_cuttlefish",

base/cvd/build_external/curl/bazel9.patch

@@ -0,0 +1,21 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index d920390..44c9b13 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -1,6 +1,7 @@
+ # Copyright The OpenTelemetry Authors
+ # SPDX-License-Identifier: Apache-2.0
+
++load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
+ load("@bazel_skylib//lib:selects.bzl", "selects")
+
+diff --git a/MODULE.bazel b/MODULE.bazel
+index d81a5d6..f9e1e8b 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -8,3 +8,4 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
+ bazel_dep(name = "mbedtls", version = "3.6.0")
+ bazel_dep(name = "platforms", version = "0.0.10")
+ bazel_dep(name = "boringssl", version = "0.20241024.0")
++bazel_dep(name = "rules_cc", version = "0.0.9")

base/cvd/build_external/curl/curl.MODULE.bazel

@@ -0,0 +1,6 @@
+single_version_override(
+    module_name = "curl",
+    version = "8.8.0.bcr.2",
+    patch_strip = 1,
+    patches = ["@//build_external/curl:bazel9.patch"],
+)

base/cvd/build_external/gflags/bazel9.patch

@@ -0,0 +1,29 @@
+diff --git a/MODULE.bazel b/MODULE.bazel
+index d81a5d6..f9e1e8b 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -3,3 +3,5 @@ module(
+     version = "2.2.2",
+     compatibility_level = 1,
+ )
++
++bazel_dep(name = "rules_cc", version = "0.0.9")
+diff --git a/bazel/gflags.bzl b/bazel/gflags.bzl
+index 6902271..027d14a 100644
+--- a/bazel/gflags.bzl
++++ b/bazel/gflags.bzl
+@@ -1,3 +1,5 @@
++load("@rules_cc//cc:defs.bzl", "cc_library")
++
+ # ------------------------------------------------------------------------------
+ # Add native rules to configure source files
+ def gflags_sources(namespace=["google", "gflags"]):
+@@ -92,7 +94,7 @@ def gflags_library(hdrs=[], srcs=[], threads=1):
+     else:
+         name += "_nothreads"
+         copts += ["-DNO_THREADS"]
+-    native.cc_library(
++    cc_library(
+         name       = name,
+         hdrs       = hdrs,
+         srcs       = srcs,

base/cvd/build_external/gflags/gflags.MODULE.bazel

@@ -0,0 +1,6 @@
+single_version_override(
+    module_name = "gflags",
+    version = "2.2.2",
+    patch_strip = 1,
+    patches = ["@//build_external/gflags:bazel9.patch"],
+)

base/cvd/build_external/gfxstream/bazel9.patch

@@ -0,0 +1,42 @@
+diff --git a/host/vulkan/CompositorFragmentShader.h b/host/vulkan/CompositorFragmentShader.h
+index d920390..44c9b13 100644
+--- a/host/vulkan/CompositorFragmentShader.h
++++ b/host/vulkan/CompositorFragmentShader.h
+@@ -18,8 +18,10 @@
+ // Autogenerated module host/vulkan/CompositorFragmentShader.h generated by:
+ //   python3 scripts/glsl-shader-to-spv.py host/vulkan/Compositor.frag host/vulkan/CompositorFragmentShader.h compositorFragmentShader
+
++#ifndef GFXSTREAM_NO_INCLUDES
+ #include <stdint.h>
+ #include <vector>
++#endif
+
+ // From host/vulkan/Compositor.frag:
+
+diff --git a/host/vulkan/CompositorVertexShader.h b/host/vulkan/CompositorVertexShader.h
+index d920390..44c9b13 100644
+--- a/host/vulkan/CompositorVertexShader.h
++++ b/host/vulkan/CompositorVertexShader.h
+@@ -18,8 +18,10 @@
+ // Autogenerated module host/vulkan/CompositorVertexShader.h generated by:
+ //   python3 scripts/glsl-shader-to-spv.py host/vulkan/Compositor.vert host/vulkan/CompositorVertexShader.h compositorVertexShader
+
++#ifndef GFXSTREAM_NO_INCLUDES
+ #include <stdint.h>
+ #include <vector>
++#endif
+
+ // From host/vulkan/Compositor.vert:
+
+diff --git a/host/vulkan/CompositorVk.cpp b/host/vulkan/CompositorVk.cpp
+index d920390..44c9b13 100644
+--- a/host/vulkan/CompositorVk.cpp
++++ b/host/vulkan/CompositorVk.cpp
+@@ -26,6 +26,7 @@
+ namespace gfxstream {
+ namespace vk {
+
++#define GFXSTREAM_NO_INCLUDES
+ namespace CompositorVkShader {
+ #include "vulkan/CompositorFragmentShader.h"
+ #include "vulkan/CompositorVertexShader.h"

base/cvd/build_external/gfxstream/gfxstream.MODULE.bazel

@@ -7,5 +7,6 @@ git_repository(
     patch_strip = 1,
     patches = [
         "@//build_external/gfxstream:PATCH.gfxstream.build_variables.patch",
+        "@//build_external/gfxstream:bazel9.patch",
     ],
 )

base/cvd/build_external/grpc-proto/grpc-proto.MODULE.bazel

@@ -0,0 +1,5 @@
+git_override(
+    module_name = "grpc-proto",
+    remote = "https://github.com/grpc/grpc-proto.git",
+    commit = "dafe8c0aa9c80e28da7808ffade0f33638a16e3d",
+)