From 22ceef9bb829f06b9cc8a3131e15ca95a99d98eb Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Tue, 20 Jan 2026 19:01:33 -0800 Subject: [PATCH] Upgrade to bazel 9 Bug: b/477396584 --- base/cvd/BUILD.android_system_extras.bazel | 2 + base/cvd/BUILD.arm_optimized_routines.bazel | 2 + base/cvd/BUILD.avb.bazel | 2 + base/cvd/BUILD.bazel | 4 + base/cvd/BUILD.crosvm.bazel | 3 + base/cvd/BUILD.egl_headers.bazel | 2 + base/cvd/BUILD.expat.bazel | 1 + base/cvd/BUILD.f2fs_tools.bazel | 3 + base/cvd/BUILD.fec_rs.bazel | 2 + base/cvd/BUILD.fruit.bazel | 2 + base/cvd/BUILD.libcap.bazel | 90 +++ base/cvd/BUILD.libcbor.bazel | 2 + base/cvd/BUILD.libconfig.bazel | 2 + base/cvd/BUILD.libdrm.bazel | 3 + base/cvd/BUILD.libeigen.bazel | 2 + base/cvd/BUILD.libffi.bazel | 2 + base/cvd/BUILD.libnl.bazel | 2 + base/cvd/BUILD.libopenscreen.bazel | 1 + base/cvd/BUILD.libpffft.bazel | 2 + base/cvd/BUILD.libsrtp2.bazel | 2 + base/cvd/BUILD.libunwind.bazel | 738 ++++++++++++++++++ base/cvd/BUILD.libusb.bazel | 2 + base/cvd/BUILD.libvpx.bazel | 2 + base/cvd/BUILD.libwebm.bazel | 2 + base/cvd/BUILD.libwebrtc.bazel | 2 + base/cvd/BUILD.libwebsockets.bazel | 2 + base/cvd/BUILD.libyuv.bazel | 3 + base/cvd/BUILD.mako.bazel | 2 + base/cvd/BUILD.markupsafe.bazel | 2 + base/cvd/BUILD.mesa.bazel | 3 + base/cvd/BUILD.mkbootimg.bazel | 2 + base/cvd/BUILD.opengl_headers.bazel | 4 +- base/cvd/BUILD.pyyaml.bazel | 2 + base/cvd/BUILD.swiftshader.bazel | 2 + base/cvd/BUILD.vulkan_headers.bazel | 4 +- base/cvd/BUILD.wmediumd.bazel | 4 + base/cvd/MODULE.bazel | 233 ++++-- base/cvd/adb/BUILD.bazel | 4 +- base/cvd/allocd/BUILD.bazel | 1 + .../brotli/BUILD.bazel} | 0 .../brotli/PATCH.brotli.bazel9.patch | 24 + base/cvd/build_external/crc32c/BUILD.bazel | 0 .../crc32c/add_build_file.patch | 103 +++ .../crc32c/module_dot_bazel.patch | 10 + .../cvd/build_external/dosfstools/BUILD.bazel | 2 + .../dosfstools/BUILD.dosfstools.bazel | 2 + base/cvd/build_external/e2fsprogs/BUILD.bazel | 2 + base/cvd/build_external/expat/BUILD.bazel | 2 + base/cvd/build_external/freetype/BUILD.bazel | 0 .../freetype/add_build_file.patch | 67 ++ .../freetype/module_dot_bazel.patch | 9 + base/cvd/build_external/fruit/BUILD.bazel | 0 .../fruit/PATCH.fruit.bazel9.patch | 9 + base/cvd/build_external/gflags/BUILD.bazel | 0 .../gflags/PATCH.gflags.bazel9.patch | 10 + .../PATCH.gfxstream.build_variables.patch | 4 +- base/cvd/build_external/grpc/BUILD.bazel | 0 .../grpc/PATCH.grpc.bazel9.patch | 167 ++++ base/cvd/build_external/jsoncpp/BUILD.bazel | 0 .../jsoncpp/PATCH.jsoncpp.bazel9.patch | 37 + base/cvd/build_external/libcap/BUILD.bazel | 0 .../libcap/module_dot_bazel.patch | 9 + base/cvd/build_external/libcbor/BUILD.bazel | 2 + .../libsrtp2_config/BUILD.bazel | 2 + base/cvd/build_external/libunwind/BUILD.bazel | 0 .../libunwind/module_dot_bazel.patch | 15 + base/cvd/build_external/libwebrtc/BUILD.bazel | 2 + .../libwebrtc/third_party/libevent/event.h | 2 +- .../build_external/libwebsockets/BUILD.bazel | 2 + base/cvd/build_external/mtools/BUILD.bazel | 2 + .../build_external/mtools/BUILD.mtools.bazel | 2 + .../build_external/netsim/0003-Pin-cxx.patch | 2 +- .../rootcanal/0006-bazel9.patch | 54 ++ base/cvd/build_external/rules_m4/BUILD.bazel | 0 .../PATCH.sandboxed_api.bazel9.patch | 21 + .../build_external/spirv_tools/BUILD.bazel | 0 .../PATCH.spirv_tools.bazel9.patch | 15 + .../build_external/swiftshader/BUILD.bazel | 0 .../PATCH.swiftshader.bazel9.patch | 14 + base/cvd/build_external/wayland/BUILD.bazel | 2 + .../wayland/BUILD.wayland.bazel | 2 + base/cvd/cuttlefish/bazel/rules.bzl | 13 +- .../host/commands/assemble_cvd/BUILD.bazel | 2 + .../casimir_control_server/BUILD.bazel | 2 + .../control_env_proxy_server/BUILD.bazel | 2 + .../host/commands/cvd/cli/parser/BUILD.bazel | 2 + .../host/commands/cvd/fetch/BUILD.bazel | 2 + .../host/commands/cvd/instances/BUILD.bazel | 2 + .../host/commands/echo_server/BUILD.bazel | 2 + .../commands/extract_ikconfig/BUILD.bazel | 2 + .../host/commands/extract_vmlinux/BUILD.bazel | 2 + .../host/commands/gnss_grpc_proxy/BUILD.bazel | 2 + .../openwrt_control_server/BUILD.bazel | 2 + .../screen_recording_server/BUILD.bazel | 2 + .../host/frontend/webrtc/BUILD.bazel | 2 + .../host/graphics_detector/BUILD.bazel | 2 + .../host/libs/command_util/BUILD.bazel | 2 + .../host/libs/image_aggregator/BUILD.bazel | 2 + base/cvd/cuttlefish/host/libs/zip/BUILD.bazel | 2 + base/cvd/cuttlefish/package/BUILD.bazel | 4 +- base/cvd/external_proto/BUILD.bazel | 3 + base/cvd/fec/BUILD.bazel | 2 + base/cvd/libbase/BUILD.bazel | 1 + base/cvd/libext4_utils/BUILD.bazel | 1 + .../include/ext4_utils/ext4_kernel_headers.h | 3 + .../libext4_utils/include/ext4_utils/jbd2.h | 2 + .../libext4_utils/include/ext4_utils/xattr.h | 2 +- base/cvd/libffi/linux-arm64/BUILD.bazel | 2 + base/cvd/libffi/linux-x86/BUILD.bazel | 2 + base/cvd/linux_headers/BUILD.bazel | 2 + base/cvd/teeui/libteeui/BUILD.bazel | 2 + .../prebuilt/localization/BUILD.bazel | 2 + base/cvd/toolchain/BUILD.bazel | 162 ++-- base/cvd/toolchain/cc_toolchain_config.bzl | 14 +- base/cvd/toolchain/cc_toolchain_macro.bzl | 72 +- .../.gitignore | 0 .../AUTHORS | 0 .../BUILD.bazel | 3 + .../COPYING | 0 .../ChangeLog | 0 .../Makefile.am | 0 .../README | 0 .../+git_repository+f2fs_tools/REPO.bazel | 0 .../VERSION | 0 .../VERSIONING | 0 .../autogen.sh | 0 .../configure.ac | 0 .../fsck/Makefile.am | 0 .../fsck/common.h | 0 .../fsck/compress.c | 0 .../fsck/compress.h | 0 .../fsck/defrag.c | 0 .../fsck/dict.c | 0 .../fsck/dict.h | 0 .../fsck/dir.c | 0 .../fsck/dqblk_v2.h | 0 .../fsck/dump.c | 0 .../fsck/f2fs.h | 0 .../fsck/fsck.c | 0 .../fsck/fsck.h | 0 .../fsck/inject.c | 0 .../fsck/inject.h | 0 .../fsck/main.c | 0 .../fsck/mkquota.c | 0 .../fsck/mount.c | 0 .../fsck/node.c | 0 .../fsck/node.h | 0 .../fsck/quotaio.c | 0 .../fsck/quotaio.h | 0 .../fsck/quotaio_tree.c | 0 .../fsck/quotaio_tree.h | 0 .../fsck/quotaio_v2.c | 0 .../fsck/quotaio_v2.h | 0 .../fsck/resize.c | 0 .../fsck/segment.c | 0 .../fsck/sload.c | 0 .../fsck/xattr.c | 0 .../fsck/xattr.h | 0 .../include/android_config.h | 0 .../include/f2fs_fs.h | 0 .../include/quota.h | 0 .../lib/Makefile.am | 0 .../lib/libf2fs.c | 0 .../lib/libf2fs_io.c | 0 .../lib/libf2fs_zoned.c | 0 .../lib/nls_utf8.c | 0 .../lib/utf8data.h | 0 .../m4/.gitignore | 0 .../man/Makefile.am | 0 .../man/defrag.f2fs.8 | 0 .../man/dump.f2fs.8 | 0 .../man/f2fs_io.8 | 0 .../man/f2fslabel.8 | 0 .../man/fsck.f2fs.8 | 0 .../man/inject.f2fs.8 | 0 .../man/mkfs.f2fs.8 | 0 .../man/resize.f2fs.8 | 0 .../man/sload.f2fs.8 | 0 .../mkfs/Makefile.am | 0 .../mkfs/f2fs_format.c | 0 .../mkfs/f2fs_format_main.c | 0 .../mkfs/f2fs_format_utils.c | 0 .../mkfs/f2fs_format_utils.h | 0 .../scripts/dumpf2fs.sh | 0 .../scripts/spo_test.sh | 0 .../scripts/tracepoint.sh | 0 .../scripts/verify.sh | 0 .../tools/Makefile.am | 0 .../tools/f2fs_io/Android.bp | 0 .../tools/f2fs_io/Makefile.am | 0 .../tools/f2fs_io/f2fs_io.c | 0 .../tools/f2fs_io/f2fs_io.h | 0 .../tools/f2fs_io_parse.c | 0 .../tools/f2fscrypt.8 | 0 .../tools/f2fscrypt.c | 0 .../tools/fibmap.c | 0 .../tools/sha512.c | 0 .../@+_repo_rules3+f2fs_tools.marker | 2 - .../@+git_repository+f2fs_tools.marker | 2 + e2etests/MODULE.bazel | 3 +- e2etests/cvd/boot_tests.bzl | 8 +- e2etests/orchestration/artifacts/BUILD.bazel | 1 + 202 files changed, 1892 insertions(+), 191 deletions(-) create mode 100644 base/cvd/BUILD.libcap.bazel create mode 100644 base/cvd/BUILD.libunwind.bazel rename base/cvd/{vendor_src/+_repo_rules3+f2fs_tools/REPO.bazel => build_external/brotli/BUILD.bazel} (100%) create mode 100644 base/cvd/build_external/brotli/PATCH.brotli.bazel9.patch create mode 100644 base/cvd/build_external/crc32c/BUILD.bazel create mode 100644 base/cvd/build_external/crc32c/add_build_file.patch create mode 100644 base/cvd/build_external/crc32c/module_dot_bazel.patch create mode 100644 base/cvd/build_external/freetype/BUILD.bazel create mode 100644 base/cvd/build_external/freetype/add_build_file.patch create mode 100644 base/cvd/build_external/freetype/module_dot_bazel.patch create mode 100644 base/cvd/build_external/fruit/BUILD.bazel create mode 100644 base/cvd/build_external/fruit/PATCH.fruit.bazel9.patch create mode 100644 base/cvd/build_external/gflags/BUILD.bazel create mode 100644 base/cvd/build_external/gflags/PATCH.gflags.bazel9.patch create mode 100644 base/cvd/build_external/grpc/BUILD.bazel create mode 100644 base/cvd/build_external/grpc/PATCH.grpc.bazel9.patch create mode 100644 base/cvd/build_external/jsoncpp/BUILD.bazel create mode 100644 base/cvd/build_external/jsoncpp/PATCH.jsoncpp.bazel9.patch create mode 100644 base/cvd/build_external/libcap/BUILD.bazel create mode 100644 base/cvd/build_external/libcap/module_dot_bazel.patch create mode 100644 base/cvd/build_external/libunwind/BUILD.bazel create mode 100644 base/cvd/build_external/libunwind/module_dot_bazel.patch create mode 100644 base/cvd/build_external/rootcanal/0006-bazel9.patch create mode 100644 base/cvd/build_external/rules_m4/BUILD.bazel create mode 100644 base/cvd/build_external/sandboxed_api/PATCH.sandboxed_api.bazel9.patch create mode 100644 base/cvd/build_external/spirv_tools/BUILD.bazel create mode 100644 base/cvd/build_external/spirv_tools/PATCH.spirv_tools.bazel9.patch create mode 100644 base/cvd/build_external/swiftshader/BUILD.bazel create mode 100644 base/cvd/build_external/swiftshader/PATCH.swiftshader.bazel9.patch rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/.gitignore (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/AUTHORS (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/BUILD.bazel (95%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/COPYING (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/ChangeLog (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/README (100%) create mode 100644 base/cvd/vendor_src/+git_repository+f2fs_tools/REPO.bazel rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/VERSION (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/VERSIONING (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/autogen.sh (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/configure.ac (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/common.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/compress.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/compress.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/defrag.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/dict.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/dict.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/dir.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/dqblk_v2.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/dump.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/f2fs.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/fsck.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/fsck.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/inject.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/inject.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/main.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/mkquota.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/mount.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/node.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/node.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio_tree.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio_tree.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio_v2.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/quotaio_v2.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/resize.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/segment.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/sload.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/xattr.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/fsck/xattr.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/include/android_config.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/include/f2fs_fs.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/include/quota.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/libf2fs.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/libf2fs_io.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/libf2fs_zoned.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/nls_utf8.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/lib/utf8data.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/m4/.gitignore (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/defrag.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/dump.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/f2fs_io.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/f2fslabel.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/fsck.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/inject.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/mkfs.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/resize.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/man/sload.f2fs.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/mkfs/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/mkfs/f2fs_format.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/mkfs/f2fs_format_main.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/mkfs/f2fs_format_utils.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/mkfs/f2fs_format_utils.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/scripts/dumpf2fs.sh (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/scripts/spo_test.sh (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/scripts/tracepoint.sh (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/scripts/verify.sh (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fs_io/Android.bp (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fs_io/Makefile.am (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fs_io/f2fs_io.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fs_io/f2fs_io.h (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fs_io_parse.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fscrypt.8 (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/f2fscrypt.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/fibmap.c (100%) rename base/cvd/vendor_src/{+_repo_rules3+f2fs_tools => +git_repository+f2fs_tools}/tools/sha512.c (100%) delete mode 100644 base/cvd/vendor_src/@+_repo_rules3+f2fs_tools.marker create mode 100644 base/cvd/vendor_src/@+git_repository+f2fs_tools.marker diff --git a/base/cvd/BUILD.android_system_extras.bazel b/base/cvd/BUILD.android_system_extras.bazel index fa075e2a76f..de0af52983f 100644 --- a/base/cvd/BUILD.android_system_extras.bazel +++ b/base/cvd/BUILD.android_system_extras.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") + package( default_visibility = ["//visibility:public"], ) diff --git a/base/cvd/BUILD.arm_optimized_routines.bazel b/base/cvd/BUILD.arm_optimized_routines.bazel index 31bfe061c17..33355695761 100644 --- a/base/cvd/BUILD.arm_optimized_routines.bazel +++ b/base/cvd/BUILD.arm_optimized_routines.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.avb.bazel b/base/cvd/BUILD.avb.bazel index 9ce97ace87a..ad2d9cc3338 100644 --- a/base/cvd/BUILD.avb.bazel +++ b/base/cvd/BUILD.avb.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/BUILD.bazel b/base/cvd/BUILD.bazel index f85b22a6b1f..f22dff4e2ff 100644 --- a/base/cvd/BUILD.bazel +++ b/base/cvd/BUILD.bazel @@ -1,3 +1,7 @@ +load("@rules_cc//cc:cc_import.bzl", "cc_import") +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_shell//shell:sh_binary.bzl", "sh_binary") + package_group( name = "android_cuttlefish", packages = [ diff --git a/base/cvd/BUILD.crosvm.bazel b/base/cvd/BUILD.crosvm.bazel index 4bfdf59bcee..c92bc973737 100644 --- a/base/cvd/BUILD.crosvm.bazel +++ b/base/cvd/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", diff --git a/base/cvd/BUILD.egl_headers.bazel b/base/cvd/BUILD.egl_headers.bazel index b5b41f4167d..23c430fee92 100644 --- a/base/cvd/BUILD.egl_headers.bazel +++ b/base/cvd/BUILD.egl_headers.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.expat.bazel b/base/cvd/BUILD.expat.bazel index 7ae0670952f..2a25aa45432 100644 --- a/base/cvd/BUILD.expat.bazel +++ b/base/cvd/BUILD.expat.bazel @@ -1,4 +1,5 @@ load("@//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package( default_visibility = [ diff --git a/base/cvd/BUILD.f2fs_tools.bazel b/base/cvd/BUILD.f2fs_tools.bazel index 0f8c06c470b..5376e09ee17 100644 --- a/base/cvd/BUILD.f2fs_tools.bazel +++ b/base/cvd/BUILD.f2fs_tools.bazel @@ -1,3 +1,6 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/BUILD.fec_rs.bazel b/base/cvd/BUILD.fec_rs.bazel index a874a40089d..cdca7b9c731 100644 --- a/base/cvd/BUILD.fec_rs.bazel +++ b/base/cvd/BUILD.fec_rs.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/BUILD.fruit.bazel b/base/cvd/BUILD.fruit.bazel index ff73eee5b47..0120ece4ab5 100644 --- a/base/cvd/BUILD.fruit.bazel +++ b/base/cvd/BUILD.fruit.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + cc_library( name = "fruit", srcs = glob([ diff --git a/base/cvd/BUILD.libcap.bazel b/base/cvd/BUILD.libcap.bazel new file mode 100644 index 00000000000..4d7e1d019e9 --- /dev/null +++ b/base/cvd/BUILD.libcap.bazel @@ -0,0 +1,90 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") + +genrule( + name = "cap_names_list_h", + srcs = ["libcap/include/uapi/linux/capability.h"], + outs = ["cap_names.list.h"], + # Use the same logic as libcap/Makefile + cmd = """ + sed -ne '/^#define[ \\t]CAP[_A-Z]\\+[ \\t]\\+[0-9]\\+/{s/^#define \\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)/\\{"\\1",\\2\\},/p;}' $< | \\ + tr "[:upper:]" "[:lower:]" > $@ + """, + visibility = ["//visibility:private"], +) + +cc_library( + name = "makenames_textual_hdrs", + textual_hdrs = [ + ":cap_names.list.h", + "libcap/include/uapi/linux/capability.h", + ], + visibility = ["//visibility:private"], +) + +cc_binary( + name = "makenames", + srcs = [ + "libcap/_makenames.c", + "libcap/include/sys/capability.h", + ], + includes = [ + "libcap/..", + "libcap/include", + "libcap/include/uapi", + ], + visibility = ["//visibility:private"], + deps = [":makenames_textual_hdrs"], +) + +genrule( + name = "cap_names_h", + outs = ["libcap/cap_names.h"], + cmd = "mkdir -p libcap && $(location makenames) > $@ || { rm -f $@; false; }", + tools = [":makenames"], + visibility = ["//visibility:private"], +) + +cc_library( + name = "libcap", + srcs = [ + "libcap/cap_alloc.c", + "libcap/cap_extint.c", + "libcap/cap_file.c", + "libcap/cap_flag.c", + "libcap/cap_proc.c", + "libcap/cap_text.c", + ], + copts = [ + "-Wno-tautological-compare", + "-Wno-unused-result", + # Work around sys/xattr.h not declaring this + "-DXATTR_NAME_CAPS=\"\\\"security.capability\\\"\"", + ], + includes = [ + "libcap", + "libcap/include", + "libcap/include/uapi", + ], + textual_hdrs = [ + "libcap/include/sys/capability.h", + "libcap/include/uapi/linux/capability.h", + "libcap/libcap.h", + "libcap/cap_names.h", + ], + visibility = ["//visibility:public"], +) diff --git a/base/cvd/BUILD.libcbor.bazel b/base/cvd/BUILD.libcbor.bazel index 504b57e1e53..ca727fdfce2 100644 --- a/base/cvd/BUILD.libcbor.bazel +++ b/base/cvd/BUILD.libcbor.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libconfig.bazel b/base/cvd/BUILD.libconfig.bazel index dcd8a69ce02..6a689f614a6 100644 --- a/base/cvd/BUILD.libconfig.bazel +++ b/base/cvd/BUILD.libconfig.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libdrm.bazel b/base/cvd/BUILD.libdrm.bazel index 6daecc06bf0..19e247f0fe9 100644 --- a/base/cvd/BUILD.libdrm.bazel +++ b/base/cvd/BUILD.libdrm.bazel @@ -1,3 +1,6 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_python//python:py_binary.bzl", "py_binary") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libeigen.bazel b/base/cvd/BUILD.libeigen.bazel index c3872b0e6d5..fa716d32bf5 100644 --- a/base/cvd/BUILD.libeigen.bazel +++ b/base/cvd/BUILD.libeigen.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + cc_library( name = "libeigen", hdrs = glob([ diff --git a/base/cvd/BUILD.libffi.bazel b/base/cvd/BUILD.libffi.bazel index 385860c09f3..a60f4769668 100644 --- a/base/cvd/BUILD.libffi.bazel +++ b/base/cvd/BUILD.libffi.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libnl.bazel b/base/cvd/BUILD.libnl.bazel index 7ecc0d7345a..7aeb65bcf34 100644 --- a/base/cvd/BUILD.libnl.bazel +++ b/base/cvd/BUILD.libnl.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libopenscreen.bazel b/base/cvd/BUILD.libopenscreen.bazel index c943987190f..c2f3cf2f1cf 100644 --- a/base/cvd/BUILD.libopenscreen.bazel +++ b/base/cvd/BUILD.libopenscreen.bazel @@ -1,4 +1,5 @@ load("@//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package( default_visibility = [ diff --git a/base/cvd/BUILD.libpffft.bazel b/base/cvd/BUILD.libpffft.bazel index dc95e40b629..4cf9c3eae6e 100644 --- a/base/cvd/BUILD.libpffft.bazel +++ b/base/cvd/BUILD.libpffft.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//visibility:public", diff --git a/base/cvd/BUILD.libsrtp2.bazel b/base/cvd/BUILD.libsrtp2.bazel index 48a533a6ce7..a10a71a18d4 100644 --- a/base/cvd/BUILD.libsrtp2.bazel +++ b/base/cvd/BUILD.libsrtp2.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//visibility:public", diff --git a/base/cvd/BUILD.libunwind.bazel b/base/cvd/BUILD.libunwind.bazel new file mode 100644 index 00000000000..02e56d656e8 --- /dev/null +++ b/base/cvd/BUILD.libunwind.bazel @@ -0,0 +1,738 @@ +load("@bazel_skylib//lib:selects.bzl", "selects") +load("@bazel_skylib//rules:expand_template.bzl", "expand_template") +load("@rules_cc//cc:defs.bzl", "cc_library") +load("@rules_cc//cc:cc_test.bzl", "cc_test") + +# Targets in this file are based off configure.ac, Makefile.am, and +# src/Makefile.am with the default configurations. +# +# Only supports aarch64, arm, and x86_64 on Linux for now. + +### Config settings ############################################################ + +# Bazel does not support nested selects, so we need config settings with the +# various combinations of OS and CPU. + +selects.config_setting_group( + name = "linux_arm64", + match_all = [ + "@platforms//os:linux", + "@platforms//cpu:arm64", + ], +) + +selects.config_setting_group( + name = "linux_arm", + match_all = [ + "@platforms//os:linux", + "@platforms//cpu:arm", + ], +) + +selects.config_setting_group( + name = "linux_x86_64", + match_all = [ + "@platforms//os:linux", + "@platforms//cpu:x86_64", + ], +) + +### Common defines ############################################################# + +libunwind_defines = [ + # Defaults based on configure.ac assuming we're on a modern Linux OS. + "_GNU_SOURCE", + "CONFIG_BLOCK_SIGNALS", + "CONFIG_WEAK_BACKTRACE", + "CONSERVATIVE_CHECKS", + "HAVE__BUILTIN___CLEAR_CACHE", + "HAVE__BUILTIN_UNREACHABLE", + "HAVE_ELF_H", + "HAVE_LINK_H", + "HAVE_LZMA", + "HAVE_ZLIB", +] + +### Common source files ######################################################## + +dwarf_srcs = glob(["src/dwarf/*.c"]) + +dwarf_textual_hdrs = glob(["src/dwarf/G*.c"]) + +mi_srcs = glob( + ["src/mi/*.c"], + exclude = [ + # Only included if Linux. + "src/mi/_ReadSLEB.c", + "src/mi/_ReadULEB.c", + # The Makefile does not include this, it's also broken as it can include + # Gdyn-remote.c in certain situations, which uses WSIZE, which will not + # be defined in the situations Gdyn-remote.c is included. + "src/mi/Ldyn-remote.c", + # TODO: for some reason these complain about duplicate definitions if + # included. + "src/mi/Gaddress_validator.c", + "src/mi/Gget_accessors.c", + ], +) + +mi_textual_hdrs = glob(["src/mi/G*.c"]) + +unwind_srcs = glob([ + "src/unwind/*.c", + "src/unwind/*.h", +]) + +### Features source files ###################################################### + +coredump_srcs = glob( + [ + "src/coredump/*.c", + "src/coredump/*.h", + ], + exclude = [ + "src/coredump/_UCD_access_reg_freebsd.c", + "src/coredump/_UCD_access_reg_linux.c", + "src/coredump/_UCD_access_reg_qnx.c", + "src/coredump/_UCD_get_mapinfo_generic.c", + "src/coredump/_UCD_get_mapinfo_linux.c", + "src/coredump/_UCD_get_mapinfo_qnx.c", + "src/coredump/_UCD_get_threadinfo_prstatus.c", + ], +) + select({ + "@platforms//os:linux": [ + "src/coredump/_UCD_access_reg_linux.c", + "src/coredump/_UCD_get_mapinfo_linux.c", + "src/coredump/_UCD_get_threadinfo_prstatus.c", + ], + "//conditions:default": [], +}) + +ptrace_srcs = glob([ + "src/ptrace/*.c", + "src/ptrace/*.h", +]) + +setjmp_srcs = glob([ + "src/setjmp/*.c", + "src/setjmp/*.h", +]) + select({ + "@platforms//cpu:aarch64": [ + "src/aarch64/longjmp.S", + "src/aarch64/siglongjmp.S", + ], + "@platforms//cpu:arm": [ + "src/arm/siglongjmp.S", + ], + "@platforms//cpu:x86_64": [ + "src/x86_64/longjmp.S", + "src/x86_64/siglongjmp.S", + ], +}) + +### Arch specific source files ################################################# + +arm64_srcs = select({ + "@platforms//cpu:aarch64": glob( + [ + "src/aarch64/*.c", + "src/aarch64/*.h", + ], + exclude = [ + "src/aarch64/Los-freebsd.c", + "src/aarch64/Los-linux.c", + "src/aarch64/Los-qnx.c", + "src/aarch64/Gos-freebsd.c", + "src/aarch64/Gos-linux.c", + "src/aarch64/Gos-qnx.c", + ], + ) + [ + # The Makefile doesn't include this and only includes it if the OS + # is FreeBSD. This is inconsistent with the other archs, not sure + # whether this is intended. + # "src/aarch64/setcontext.S", + "src/aarch64/getcontext.S", + "src/elf64.h", + ], + "//conditions:default": [], +}) + +arm64_textual_hdrs = select({ + "@platforms//cpu:aarch64": glob( + [ + "src/aarch64/G*.c", + ], + exclude = [ + "src/aarch64/Gos-freebsd.c", + "src/aarch64/Gos-linux.c", + "src/aarch64/Gos-qnx.c", + ], + ) + [ + "src/elf64.c", + ], + "//conditions:default": [], +}) + +arm_srcs = select({ + "@platforms//cpu:arm": glob( + [ + "src/arm/*.c", + "src/arm/*.h", + ], + exclude = [ + "src/arm/Los-freebsd.c", + "src/arm/Los-linux.c", + "src/arm/Los-other.c", + "src/arm/Gos-freebsd.c", + "src/arm/Gos-linux.c", + "src/arm/Gos-other.c", + ], + ) + [ + "src/arm/getcontext.S", + "src/elf32.h", + ], + "//conditions:default": [], +}) + +arm_textual_hdrs = select({ + "@platforms//cpu:arm": glob( + [ + "src/arm/G*.c", + ], + exclude = [ + "src/arm/Gos-freebsd.c", + "src/arm/Gos-linux.c", + "src/arm/Gos-other.c", + ], + ) + [ + "src/elf32.c", + ], + "//conditions:default": [], +}) + +x86_64_srcs = select({ + "@platforms//cpu:x86_64": glob( + [ + "src/x86_64/*.c", + "src/x86_64/*.h", + ], + exclude = [ + "src/x86_64/Los-freebsd.c", + "src/x86_64/Los-linux.c", + "src/x86_64/Los-qnx.c", + "src/x86_64/Los-solaris.c", + "src/x86_64/Gos-freebsd.c", + "src/x86_64/Gos-linux.c", + "src/x86_64/Gos-qnx.c", + "src/x86_64/Gos-solaris.c", + ], + ) + [ + "src/elf64.h", + "src/x86_64/getcontext.S", + "src/x86_64/setcontext.S", + ], + "//conditions:default": [], +}) + +x86_64_textual_hdrs = select({ + "@platforms//cpu:x86_64": glob( + [ + "src/x86_64/G*.c", + ], + exclude = [ + "src/x86_64/Gos-freebsd.c", + "src/x86_64/Gos-linux.c", + "src/x86_64/Gos-qnx.c", + "src/x86_64/Gos-solaris.c", + ], + ) + [ + "src/elf64.c", + ], + "//conditions:default": [], +}) + +### OS specific source files ################################################### + +linux_srcs = select({ + "@platforms//os:linux": [ + "src/dl-iterate-phdr.c", + "src/mi/_ReadSLEB.c", + "src/mi/_ReadULEB.c", + "src/os-linux.c", + "src/os-linux.h", + ], + "//conditions:default": [], +}) + select({ + ":linux_arm64": [ + "src/aarch64/Los-linux.c", + "src/aarch64/Gos-linux.c", + ], + "//conditions:default": [], +}) + select({ + ":linux_arm": [ + "src/arm/Los-linux.c", + "src/arm/Gos-linux.c", + ], + "//conditions:default": [], +}) + select({ + ":linux_x86_64": [ + "src/x86_64/Los-linux.c", + "src/x86_64/Gos-linux.c", + ], + "//conditions:default": [], +}) + +linux_textual_hdrs = select({ + ":linux_arm64": ["src/aarch64/Gos-linux.c"], + "//conditions:default": [], +}) + select({ + ":linux_arm": ["src/arm/Gos-linux.c"], + "//conditions:default": [], +}) + select({ + ":linux_x86_64": ["src/x86_64/Gos-linux.c"], + "//conditions:default": [], +}) + +### libunwind ################################################################## + +libunwind_srcs = [ + "src/elfxx.h", + "src/elfxx.c", +] + dwarf_srcs + mi_srcs + unwind_srcs + arm64_srcs + arm_srcs + x86_64_srcs + linux_srcs + +libunwind_textual_hdrs = [ + "src/elfxx.c", +] + dwarf_textual_hdrs + mi_textual_hdrs + arm64_textual_hdrs + arm_textual_hdrs + x86_64_textual_hdrs + linux_textual_hdrs + +expand_template( + name = "libunwind_common_h", + out = "include/libunwind-common.h", + substitutions = { + "@PKG_MAJOR@": "1", + "@PKG_MINOR@": "8", + "@PKG_EXTRA@": "1", + }, + template = "include/libunwind-common.h.in", +) + +cc_library( + name = "unwind", + srcs = libunwind_srcs, + hdrs = glob(["include/tdep/*.h"]) + [ + "include/compiler.h", + "include/dwarf.h", + "include/dwarf-eh.h", + "include/dwarf_i.h", + "include/libunwind.h", + "include/libunwind-dynamic.h", + "include/libunwind_i.h", + "include/mempool.h", + "include/remote.h", + "include/unwind.h", + ":libunwind_common_h", + ] + select({ + "@platforms//cpu:arm64": glob(["include/tdep-aarch64/*.h"]) + ["include/libunwind-aarch64.h"], + "@platforms//cpu:arm": glob(["include/tdep-arm/*.h"]) + ["include/libunwind-arm.h"], + "@platforms//cpu:x86_64": ["include/libunwind-x86_64.h"] + glob(["include/tdep-x86_64/*.h"]), + }), + includes = [ + "include", + "src", + ] + select({ + "@platforms//cpu:arm64": [ + "include/tdep-aarch64", + ], + "@platforms//cpu:arm": [ + "include/tdep-arm", + ], + "@platforms//cpu:x86_64": [ + "include/tdep-x86_64", + ], + }), + local_defines = libunwind_defines + ["HAVE_DL_ITERATE_PHDR"], + textual_hdrs = libunwind_textual_hdrs, + deps = [ + "@xz//:lzma", + "@zlib", + ], +) + +cc_library( + name = "unwind_coredump", + srcs = coredump_srcs + ["src/mi/init.c"], + hdrs = ["include/libunwind-coredump.h"], + includes = ["include"], + local_defines = libunwind_defines + [ + "HAVE_STRUCT_ELF_PRSTATUS", + "HAVE_SYS_PROCFS_H", + ] + select({ + "@platforms//cpu:arm64": [ + "CONFIG_DEBUG_FRAME", + "SIZEOF_OFF_T=8", + ], + "@platforms//cpu:arm": [ + "CONFIG_DEBUG_FRAME", + "SIZEOF_OFF_T=4", + ], + "@platforms//cpu:x86_64": [ + "SIZEOF_OFF_T=8", + ], + }), + deps = [ + ":unwind", + "@xz//:lzma", + "@zlib", + ], +) + +cc_library( + name = "unwind_ptrace", + srcs = ptrace_srcs + ["src/mi/init.c"], + hdrs = ["include/libunwind-ptrace.h"], + includes = ["include"], + local_defines = libunwind_defines + ["HAVE_TTRACE"], + deps = [ + ":unwind", + "@xz//:lzma", + "@zlib", + ], +) + +cc_library( + name = "unwind_setjmp", + srcs = setjmp_srcs + ["src/mi/init.c"], + local_defines = libunwind_defines, + deps = [ + ":unwind", + "@xz//:lzma", + "@zlib", + ], +) + +alias( + name = "libunwind", + actual = ":unwind", + visibility = ["//visibility:public"], +) + +alias( + name = "libunwind_coredump", + actual = ":unwind_coredump", + visibility = ["//visibility:public"], +) + +alias( + name = "libunwind_ptrace", + actual = ":unwind_ptrace", + visibility = ["//visibility:public"], +) + +alias( + name = "libunwind_setjmp", + actual = ":unwind_setjmp", + visibility = ["//visibility:public"], +) + +### Tests ##################################################################### + +# TODO: the following tests currently do not work: +# crasher.c +# forker.c +# test-coredump-unwind.c +# test-init-remote.c +# test-proc-info.c +# test-ptrace-misc.c +# test-ptrace.c +# test-setjmp.c + +# Some tests require these test helper files. +cc_library( + name = "unwind_test_helpers", + testonly = True, + srcs = [ + "tests/flush-cache.S", + "tests/ident.c", + ], + hdrs = glob(["tests/*G*.c"]) + [ + "tests/Gtest-init.cxx", + "tests/flush-cache.h", + "tests/ident.h", + ], + defines = ["_GNU_SOURCE"], +) + +cc_test( + name = "frame_record_test", + srcs = ["tests/aarch64-test-frame-record.c"], + target_compatible_with = ["@platforms//cpu:arm64"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "plt_test", + srcs = ["tests/aarch64-test-plt.c"], + target_compatible_with = ["@platforms//cpu:arm64"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "arm64_sve_signal_test", + srcs = ["tests/Larm64-test-sve-signal.c"], + target_compatible_with = ["@platforms//cpu:arm64"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "perf_simple_test", + srcs = ["tests/Lperf-simple.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "perf_trace_test", + srcs = ["tests/Lperf-trace.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "rs_race_test", + srcs = ["tests/Lrs-race.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "bt_test", + srcs = ["tests/Ltest-bt.c"], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "concurrent_test", + srcs = ["tests/Ltest-concurrent.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "cxx_exceptions_test", + srcs = ["tests/Ltest-cxx-exceptions.cxx"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +# TODO: fails on Debian 11 and Ubuntu 20.04. +# cc_test( +# name = "dyn1_test", +# srcs = ["tests/Ltest-dyn1.c"], +# deps = [ +# ":unwind", +# ":unwind_test_helpers", +# ], +# linkopts = ["-ldl"], +# ) + +cc_test( + name = "exc_test", + srcs = ["tests/Ltest-exc.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "init_local_signal_test", + srcs = [ + "tests/Ltest-init-local-signal.c", + "tests/Ltest-init-local-signal-lib.c", + ], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "init_test", + srcs = ["tests/Ltest-init.cxx"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "mem_validate_test", + srcs = ["tests/Ltest-mem-validate.c"], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "nocalloc_test", + srcs = ["tests/Ltest-nocalloc.c"], + linkopts = ["-ldl"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "nomalloc_test", + srcs = ["tests/Ltest-nomalloc.c"], + linkopts = ["-ldl"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "resume_sig_rt_test", + srcs = ["tests/Ltest-resume-sig-rt.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "resume_sig_test", + srcs = ["tests/Ltest-resume-sig.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "trace_test", + srcs = ["tests/Ltest-trace.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "varargs_test", + srcs = ["tests/Ltest-varargs.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "dwarf_expressions_test", + srcs = [ + "tests/Lx64-test-dwarf-expressions.c", + "tests/x64-test-dwarf-expressions.S", + ], + target_compatible_with = ["@platforms//cpu:x86_64"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "async_sig_test", + srcs = ["tests/test-async-sig.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "flush_cache_test", + srcs = ["tests/test-flush-cache.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "mem_test", + srcs = ["tests/test-mem.c"], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "reg_state_test", + srcs = ["tests/test-reg-state.c"], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "static_link_loc_test", + srcs = [ + "tests/test-static-link-gen.c", + "tests/test-static-link-loc.c", + ], + local_defines = ["UNW_LOCAL_ONLY"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "strerror_test", + srcs = ["tests/test-strerror.c"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) + +cc_test( + name = "unwind_badjmp_signal_frame_test", + srcs = ["tests/x64-unwind-badjmp-signal-frame.c"], + target_compatible_with = ["@platforms//cpu:x86_64"], + deps = [ + ":unwind", + ":unwind_test_helpers", + ], +) diff --git a/base/cvd/BUILD.libusb.bazel b/base/cvd/BUILD.libusb.bazel index 0fa3bfd864c..85c58e9912b 100644 --- a/base/cvd/BUILD.libusb.bazel +++ b/base/cvd/BUILD.libusb.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libvpx.bazel b/base/cvd/BUILD.libvpx.bazel index 8e5d291d281..24f9242b93d 100644 --- a/base/cvd/BUILD.libvpx.bazel +++ b/base/cvd/BUILD.libvpx.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//visibility:private", diff --git a/base/cvd/BUILD.libwebm.bazel b/base/cvd/BUILD.libwebm.bazel index ac722bcbf6b..028916a054e 100644 --- a/base/cvd/BUILD.libwebm.bazel +++ b/base/cvd/BUILD.libwebm.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libwebrtc.bazel b/base/cvd/BUILD.libwebrtc.bazel index 3f784f40326..977cae75541 100644 --- a/base/cvd/BUILD.libwebrtc.bazel +++ b/base/cvd/BUILD.libwebrtc.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libwebsockets.bazel b/base/cvd/BUILD.libwebsockets.bazel index 5fe3b6417b8..1a70594b3af 100644 --- a/base/cvd/BUILD.libwebsockets.bazel +++ b/base/cvd/BUILD.libwebsockets.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.libyuv.bazel b/base/cvd/BUILD.libyuv.bazel index b90f3f6b054..6e02785030c 100644 --- a/base/cvd/BUILD.libyuv.bazel +++ b/base/cvd/BUILD.libyuv.bazel @@ -1,3 +1,6 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:cc_test.bzl", "cc_test") + cc_library( name = "libyuv", srcs = glob( diff --git a/base/cvd/BUILD.mako.bazel b/base/cvd/BUILD.mako.bazel index ae1d9740c7a..a6f02a04ff1 100644 --- a/base/cvd/BUILD.mako.bazel +++ b/base/cvd/BUILD.mako.bazel @@ -1,3 +1,5 @@ +load("@rules_python//python:defs.bzl", "py_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.markupsafe.bazel b/base/cvd/BUILD.markupsafe.bazel index 43663c3d5bf..90a0264a95d 100644 --- a/base/cvd/BUILD.markupsafe.bazel +++ b/base/cvd/BUILD.markupsafe.bazel @@ -1,3 +1,5 @@ +load("@rules_python//python:defs.bzl", "py_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.mesa.bazel b/base/cvd/BUILD.mesa.bazel index 266a8ad50de..030c205946b 100644 --- a/base/cvd/BUILD.mesa.bazel +++ b/base/cvd/BUILD.mesa.bazel @@ -1,4 +1,7 @@ load("@//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") +load("@rules_python//python:py_binary.bzl", "py_binary") package( default_visibility = ["@//:android_cuttlefish"], diff --git a/base/cvd/BUILD.mkbootimg.bazel b/base/cvd/BUILD.mkbootimg.bazel index 8449035967c..edb8dd30f40 100644 --- a/base/cvd/BUILD.mkbootimg.bazel +++ b/base/cvd/BUILD.mkbootimg.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/BUILD.opengl_headers.bazel b/base/cvd/BUILD.opengl_headers.bazel index d2af3966574..d92e5ecfd0b 100644 --- a/base/cvd/BUILD.opengl_headers.bazel +++ b/base/cvd/BUILD.opengl_headers.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) @@ -41,4 +43,4 @@ cc_library( deps = [ "@egl_headers//:egl_headers", ], -) \ No newline at end of file +) diff --git a/base/cvd/BUILD.pyyaml.bazel b/base/cvd/BUILD.pyyaml.bazel index f86c9191c55..c77560c8529 100644 --- a/base/cvd/BUILD.pyyaml.bazel +++ b/base/cvd/BUILD.pyyaml.bazel @@ -1,3 +1,5 @@ +load("@rules_python//python:defs.bzl", "py_library") + package( default_visibility = [ "@//:android_cuttlefish", diff --git a/base/cvd/BUILD.swiftshader.bazel b/base/cvd/BUILD.swiftshader.bazel index e6716aa6a67..cef76d71287 100644 --- a/base/cvd/BUILD.swiftshader.bazel +++ b/base/cvd/BUILD.swiftshader.bazel @@ -1,4 +1,6 @@ load("@//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") package( default_visibility = [ diff --git a/base/cvd/BUILD.vulkan_headers.bazel b/base/cvd/BUILD.vulkan_headers.bazel index 05ae665878e..3c2049020a2 100644 --- a/base/cvd/BUILD.vulkan_headers.bazel +++ b/base/cvd/BUILD.vulkan_headers.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) @@ -27,4 +29,4 @@ filegroup( srcs = [ "registry/vk.xml", ], -) \ No newline at end of file +) diff --git a/base/cvd/BUILD.wmediumd.bazel b/base/cvd/BUILD.wmediumd.bazel index 0a2d608b08d..1e2245f52c2 100644 --- a/base/cvd/BUILD.wmediumd.bazel +++ b/base/cvd/BUILD.wmediumd.bazel @@ -1,5 +1,9 @@ load("@//:build_variables.bzl", "COPTS") load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") package( default_visibility = [ diff --git a/base/cvd/MODULE.bazel b/base/cvd/MODULE.bazel index a3d1eb4039a..adef4c533ba 100644 --- a/base/cvd/MODULE.bazel +++ b/base/cvd/MODULE.bazel @@ -5,58 +5,187 @@ # For more details, please check https://github.com/bazelbuild/bazel/issues/18958 ############################################################################### -bazel_dep(name = "abseil-cpp", version = "20250814.0") -bazel_dep(name = "aspect_bazel_lib", version = "2.14.0") -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 = "abseil-cpp", version = "20260107.0") +bazel_dep(name = "aspect_bazel_lib", version = "2.22.5") +bazel_dep(name = "aspect_rules_lint", version = "2.0.0-rc0") +bazel_dep(name = "bazel_skylib", version = "1.9.0", dev_dependency = True) bazel_dep(name = "boringssl", version = "0.20241024.0") bazel_dep(name = "brotli", version = "1.1.0") +bazel_dep(name = "bzip2", version = "1.0.8.bcr.3") +bazel_dep(name = "c-ares", version = "1.34.6") 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") +bazel_dep(name = "curl", version = "8.11.0.bcr.4") +bazel_dep(name = "cxx.rs", version = "1.0.192") bazel_dep(name = "fmt", version = "11.2.0.bcr.1") bazel_dep(name = "freetype", version = "2.13.3.bcr.1") bazel_dep(name = "gflags", version = "2.2.2") 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", version = "1.17.0") -bazel_dep(name = "grpc", version = "1.71.0") -bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58") +bazel_dep(name = "grpc", version = "1.78.0-pre1") +bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1") 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 = "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", version = "3.1.3.bcr.2") bazel_dep(name = "libpng", version = "1.6.47.bcr.1") -bazel_dep(name = "libuuid", version = "2.39.3.bcr.1") +bazel_dep(name = "libunwind", version = "1.8.1") +bazel_dep(name = "libuuid", version = "2.41.2") 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") -bazel_dep(name = "nasm", version = "2.16.03.bcr.1") +bazel_dep(name = "nasm", version = "2.16.03.bcr.2") bazel_dep(name = "pcre2", version = "10.45") bazel_dep(name = "platforms", version = "1.0.0") -bazel_dep(name = "protobuf", version = "31.1") +bazel_dep(name = "protobuf", version = "33.4") +bazel_dep(name = "re2", version = "2025-11-05.bcr.1") bazel_dep(name = "rootcanal") -bazel_dep(name = "rules_cc", version = "0.2.8") +bazel_dep(name = "rules_cc", version = "0.2.16") bazel_dep(name = "rules_flex", version = "0.4") +bazel_dep(name = "rules_foreign_cc", version = "0.15.1") bazel_dep(name = "rules_license", version = "1.0.0") +bazel_dep(name = "rules_m4", version = "0.3") +bazel_dep(name = "rules_nodejs", version = "6.7.3") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_proto_grpc_cpp", version = "5.0.1") bazel_dep(name = "rules_proto_grpc_go", version = "5.3.0") -bazel_dep(name = "rules_python", version = "1.1.0") -bazel_dep(name = "rules_rust", version = "0.67.0") +bazel_dep(name = "rules_python", version = "1.5.0") +bazel_dep(name = "rules_rust", version = "0.68.1") +bazel_dep(name = "rules_shell", version = "0.6.1") bazel_dep(name = "tinyxml2", version = "10.0.0") -bazel_dep(name = "toolchains_llvm", version = "1.4.0") +bazel_dep(name = "toolchains_llvm", version = "1.6.0") bazel_dep(name = "sandboxed_api") +bazel_dep(name = "xz", version = "5.4.5.bcr.7") bazel_dep(name = "zlib", version = "1.3.1.bcr.7") include("//build_external:build_external.MODULE.bazel") +cc_compatibility_proxy = use_extension("@rules_cc//cc:extensions.bzl", "compatibility_proxy") +use_repo(cc_compatibility_proxy, "cc_compatibility_proxy") + # this needs to be at parity with with build_external/crosvm/crosvm.config.toml CROSVM_REMOTE = "https://chromium.googlesource.com/crosvm/crosvm" CROSVM_REV = "bc84c8bd6ce078e251594aa1af9e84932c5d0d81" +single_version_override( + module_name = "rules_python", + version = "1.5.0", +) + +git_override( + module_name = "aspect_rules_lint", + commit = "2d414974255d3b01d4776f855f2aeb407fe4f016", + remote = "https://github.com/aspect-build/rules_lint", +) + +# fix for bazel 9 +git_override( + module_name = "grpc", + commit = "61fe9b40a986792ab7d4eb8924027b671faf26ba", + remote = "https://github.com/grpc/grpc", + patch_strip = 1, + patches = [ + "@//build_external/grpc:PATCH.grpc.bazel9.patch", + ], +) + +# fix for bazel 9 +git_override( + module_name = "brotli", + commit = "5fa73e23bee34f84148719576a7a434f0fc43dc8", + remote = "https://github.com/google/brotli", + patch_strip = 1, + patches = [ + "@//build_external/brotli:PATCH.brotli.bazel9.patch", + ], +) + +# fix for bazel 9 +archive_override( + module_name = "crc32c", + urls = [ + "https://github.com/google/crc32c/archive/refs/tags/1.1.0.tar.gz", + ], + strip_prefix = "crc32c-1.1.0", + patches = [ + "@//build_external/crc32c:add_build_file.patch", + "@//build_external/crc32c:module_dot_bazel.patch", + ], +) + +# fix for bazel 9 +archive_override( + module_name = "freetype", + urls = [ + "https://mirrors.ocf.berkeley.edu/nongnu/freetype/freetype-2.13.3.tar.gz", + "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.gz", + "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.gz", + "https://mirror.netcologne.de/savannah/freetype/freetype-2.13.3.tar.gz", + ], + strip_prefix = "freetype-2.13.3", + patches = [ + "@//build_external/freetype:add_build_file.patch", + "@//build_external/freetype:module_dot_bazel.patch", + ], +) + +# fix for bazel 9 +archive_override( + module_name = "libcap", + urls = [ + "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.27.tar.gz", + ], + strip_prefix = "libcap-2.27", + build_file = "@//:BUILD.libcap.bazel", + patches = [ + "@//build_external/libcap:module_dot_bazel.patch", + ], +) + +# fix for bazel 9 +archive_override( + module_name = "libunwind", + urls = [ + "https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz", + ], + strip_prefix = "libunwind-1.8.1", + build_file = "@//:BUILD.libunwind.bazel", + patches = [ + "@//build_external/libunwind:module_dot_bazel.patch", + ], +) + +# fix for bazel 9 +git_override( + module_name = "jsoncpp", + commit = "b511d9e64956db998b74909df112ac8c8f41d6ff", + remote = "https://github.com/open-source-parsers/jsoncpp", + patch_strip = 1, + patches = [ + "@//build_external/jsoncpp:PATCH.jsoncpp.bazel9.patch", + ], +) + +# fix for bazel 9 +git_override( + module_name = "googletest", + commit = "85087857ad10bd407cd6ed2f52f7ea9752db621f", + remote = "https://github.com/google/googletest", +) + +# fix for bazel 9 +git_override( + module_name = "gflags", + commit = "5319350323577cff4c42ab59118531d04f13edf4", + remote = "https://github.com/gflags/gflags", + patch_strip = 1, + patches = [ + "@//build_external/gflags:PATCH.gflags.bazel9.patch", + ], +) + # Hedron's Compile Commands Extractor for Bazel # https://github.com/hedronvision/bazel-compile-commands-extractor git_override( @@ -70,10 +199,11 @@ git_override( git_override( module_name = "sandboxed_api", - commit = "c520612b14a472e0b4784e9f9e41f9e822264cc3", + commit = "d06ef8831a3e13120178e806254979b675ade844", remote = "https://github.com/google/sandboxed-api.git", patch_strip = 1, patches = [ + "@//build_external/sandboxed_api:PATCH.sandboxed_api.bazel9.patch", # See cl/711879539 "@//build_external/sandboxed_api:PATCH.sandboxed_api.util.visibility.patch", ], @@ -94,6 +224,7 @@ git_override( "@//build_external/rootcanal:0003-Make-rootcanal_proto-public.patch", "@//build_external/rootcanal:0004-Add-link_layer_packets_rs.patch", "@//build_external/rootcanal:0005-Define-librootcanal_ffi.so-and-librootcanal-librarie.patch", + "@//build_external/rootcanal:0006-bazel9.patch", ], ) @@ -104,22 +235,22 @@ llvm.toolchain( use_repo(llvm, "llvm_toolchain") -file_detector = use_repo_rule("//toolchain:file_detector.bzl", "file_detector") - -file_detector( - name = "clang_detector", - files = { - "/usr/bin/clang-11": "clang_11", - "/usr/bin/clang-12": "clang_12", - "/usr/bin/clang-13": "clang_13", - "/usr/bin/clang-14": "clang_14", - "/usr/bin/clang-15": "clang_15", - "/usr/bin/clang-16": "clang_16", - "/usr/bin/clang-17": "clang_17", - "/usr/bin/clang-18": "clang_18", - "/usr/bin/clang-19": "clang_19", - }, -) +# file_detector = use_repo_rule("//toolchain:file_detector.bzl", "file_detector") +# +# file_detector( +# name = "clang_detector", +# files = { +# "/usr/bin/clang-11": "clang_11", +# "/usr/bin/clang-12": "clang_12", +# "/usr/bin/clang-13": "clang_13", +# "/usr/bin/clang-14": "clang_14", +# "/usr/bin/clang-15": "clang_15", +# "/usr/bin/clang-16": "clang_16", +# "/usr/bin/clang-17": "clang_17", +# "/usr/bin/clang-18": "clang_18", +# "/usr/bin/clang-19": "clang_19", +# }, +# ) # The first toolchain that satisfies platform constraints is chosen. # Alternatively, a specific toolchain can be chosen with the @@ -132,15 +263,15 @@ file_detector( # For more information, see https://bazel.build/extending/toolchains register_toolchains( "@llvm_toolchain//:all", # TODO: b/407854179 - demote after testing others - "//toolchain:linux_local_clang_19", - "//toolchain:linux_local_clang_18", - "//toolchain:linux_local_clang_17", - "//toolchain:linux_local_clang_16", - "//toolchain:linux_local_clang_15", - "//toolchain:linux_local_clang_14", - "//toolchain:linux_local_clang_13", - "//toolchain:linux_local_clang_12", - "//toolchain:linux_local_clang_11", +# "//toolchain:linux_local_clang_19", +# "//toolchain:linux_local_clang_18", +# "//toolchain:linux_local_clang_17", +# "//toolchain:linux_local_clang_16", +# "//toolchain:linux_local_clang_15", +# "//toolchain:linux_local_clang_14", +# "//toolchain:linux_local_clang_13", +# "//toolchain:linux_local_clang_12", +# "//toolchain:linux_local_clang_11", ) python = use_extension("@rules_python//python/extensions:python.bzl", "python") @@ -312,6 +443,7 @@ netsim_crates.annotation( "BINDING_PATH": "$(execpath bindings/bindings.rs)", }, additive_build_file_content = """ +load("@rules_cc//cc:cc_library.bzl", "cc_library") cc_library( name = "grpc_wrap", @@ -510,13 +642,14 @@ git_repository( git_repository( name = "fruit", build_file = "@//:BUILD.fruit.bazel", - commit = "0af6ffd113ad963dbd2a23e8cbabba13493c015f", # 2025-02-02 + commit = "45cc0583a170bc29a41e02e10911b1dee699c60c", # 2025-12-27 remote = "https://github.com/google/fruit.git", + patch_strip = 1, ) git_repository( name = "gfxstream", - commit = "efbcd112d2cf43b7bca9260f8d81fd948446bcd3", + commit = "063d40e141c9db942ad1eb604bce20e6c0415d0d", remote = "https://github.com/google/gfxstream.git", patch_strip = 1, patches = [ @@ -709,14 +842,18 @@ git_repository( git_repository( name = "spirv_headers", - commit = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7", + commit = "babee77020ff82b571d723ce2c0262e2ec0ee3f1", remote = "https://github.com/KhronosGroup/SPIRV-Headers.git", ) git_repository( name = "spirv_tools", - commit = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7", # v2024.2 + commit = "262bdab48146c937467f826699a40da0fdfc0f1a", # v2025.5 remote = "https://github.com/KhronosGroup/SPIRV-Tools.git", + patch_strip = 1, + patches = [ + "@//build_external/spirv_tools:PATCH.spirv_tools.bazel9.patch", + ], ) git_repository( @@ -724,6 +861,10 @@ git_repository( build_file = "@//:BUILD.swiftshader.bazel", commit = "14f87286123a47207ba25d0d32ebda27b13fe5a3", remote = "https://swiftshader.googlesource.com/SwiftShader.git", + patch_strip = 1, + patches = [ + "@//build_external/swiftshader:PATCH.swiftshader.bazel9.patch", + ], ) git_repository( diff --git a/base/cvd/adb/BUILD.bazel b/base/cvd/adb/BUILD.bazel index f2b2217b02a..4e2c45425c1 100644 --- a/base/cvd/adb/BUILD.bazel +++ b/base/cvd/adb/BUILD.bazel @@ -1,5 +1,7 @@ -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") load("//:build_variables.bzl", "COPTS") +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") package( default_visibility = ["//:android_cuttlefish"], diff --git a/base/cvd/allocd/BUILD.bazel b/base/cvd/allocd/BUILD.bazel index fc3c91aeeaf..9fe194e483b 100644 --- a/base/cvd/allocd/BUILD.bazel +++ b/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"], diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/REPO.bazel b/base/cvd/build_external/brotli/BUILD.bazel similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/REPO.bazel rename to base/cvd/build_external/brotli/BUILD.bazel diff --git a/base/cvd/build_external/brotli/PATCH.brotli.bazel9.patch b/base/cvd/build_external/brotli/PATCH.brotli.bazel9.patch new file mode 100644 index 00000000000..2f47bd9ee2f --- /dev/null +++ b/base/cvd/build_external/brotli/PATCH.brotli.bazel9.patch @@ -0,0 +1,24 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 003c1b9..d6414c0 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -5,6 +5,9 @@ package( + default_visibility = ["//visibility:public"], + ) + ++load("@rules_cc//cc:cc_binary.bzl", "cc_binary") ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++ + licenses(["notice"]) # MIT + + exports_files(["LICENSE"]) +diff --git a/MODULE.bazel b/MODULE.bazel +index 489171e..473c7a5 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -10,3 +10,5 @@ module( + version = "1.2.0", + repo_name = "org_brotli", + ) ++ ++bazel_dep(name = "rules_cc", version = "0.2.16") diff --git a/base/cvd/build_external/crc32c/BUILD.bazel b/base/cvd/build_external/crc32c/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/crc32c/add_build_file.patch b/base/cvd/build_external/crc32c/add_build_file.patch new file mode 100644 index 00000000000..b090e80583f --- /dev/null +++ b/base/cvd/build_external/crc32c/add_build_file.patch @@ -0,0 +1,103 @@ +--- /dev/null ++++ BUILD.bazel +@@ -0,0 +1,100 @@ ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++ ++package( ++ default_visibility = ["//visibility:public"], ++ features = ["header_modules"], ++) ++ ++licenses(["notice"]) ++ ++crc32c_arm64_HDRS = [ ++ "src/crc32c_arm64.h", ++] ++ ++crc32c_arm64_SRCS = [ ++ "src/crc32c_arm64.cc", ++] ++ ++crc32c_sse42_HDRS = [ ++ "src/crc32c_sse42.h", ++] ++ ++crc32c_sse42_SRCS = [ ++ "src/crc32c_sse42.cc", ++] ++ ++crc32c_HDRS = [ ++ "src/crc32c_arm64.h", ++ "src/crc32c_arm64_linux_check.h", ++ "src/crc32c_internal.h", ++ "src/crc32c_prefetch.h", ++ "src/crc32c_read_le.h", ++ "src/crc32c_round_up.h", ++ "src/crc32c_sse42.h", ++ "src/crc32c_sse42_check.h", ++ "include/crc32c/crc32c.h", ++] ++ ++crc32c_SRCS = [ ++ "src/crc32c_portable.cc", ++ "src/crc32c.cc", ++] ++ ++config_setting( ++ name = "windows", ++ values = {"cpu": "x64_windows"}, ++ visibility = ["//visibility:public"], ++) ++ ++config_setting( ++ name = "linux_x86_64", ++ values = {"cpu": "k8"}, ++ visibility = ["//visibility:public"], ++) ++ ++config_setting( ++ name = "darwin", ++ values = {"cpu": "darwin"}, ++ visibility = ["//visibility:public"], ++) ++ ++sse42_copts = select({ ++ ":windows": ["/arch:AVX"], ++ ":linux_x86_64": ["-msse4.2"], ++ ":darwin": ["-msse4.2"], ++ "//conditions:default": [], ++}) ++ ++sse42_enabled = select({ ++ ":windows": "1", ++ ":linux_x86_64": "1", ++ ":darwin": "1", ++ "//conditions:default": "0", ++}) ++ ++genrule( ++ name = "generate_config", ++ srcs = ["src/crc32c_config.h.in"], ++ outs = ["crc32c/crc32c_config.h"], ++ cmd = """ ++sed -e 's/#cmakedefine01/#define/' \ ++ -e 's/ BYTE_ORDER_BIG_ENDIAN/ BYTE_ORDER_BIG_ENDIAN 0/' \ ++ -e 's/ HAVE_BUILTIN_PREFETCH/ HAVE_BUILTIN_PREFETCH 0/' \ ++ -e 's/ HAVE_MM_PREFETCH/ HAVE_MM_PREFETCH 0/' \ ++ -e 's/ HAVE_SSE42/ HAVE_SSE42 1/' \ ++ -e 's/ HAVE_ARM64_CRC32C/ HAVE_ARM64_CRC32C 0/' \ ++ -e 's/ HAVE_STRONG_GETAUXVAL/ HAVE_STRONG_GETAUXVAL 0/' \ ++ -e 's/ HAVE_WEAK_GETAUXVAL/ HAVE_WEAK_GETAUXVAL 0/' \ ++ -e 's/ CRC32C_TESTS_BUILT_WITH_GLOG/ CRC32C_TESTS_BUILT_WITH_GLOG 0/' \ ++ < $< > $@ ++""", ++) ++ ++cc_library( ++ name = "crc32c", ++ srcs = crc32c_SRCS + crc32c_sse42_SRCS + crc32c_arm64_SRCS, ++ hdrs = crc32c_HDRS + ["crc32c/crc32c_config.h"], ++ copts = sse42_copts, ++ includes = ["include"], ++ deps = [], ++) diff --git a/base/cvd/build_external/crc32c/module_dot_bazel.patch b/base/cvd/build_external/crc32c/module_dot_bazel.patch new file mode 100644 index 00000000000..fff00d988c7 --- /dev/null +++ b/base/cvd/build_external/crc32c/module_dot_bazel.patch @@ -0,0 +1,10 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,7 @@ ++module( ++ name = "crc32c", ++ version = "1.1.0", ++ compatibility_level = 1, ++) ++ ++bazel_dep(name = "rules_cc", version = "0.2.16") diff --git a/base/cvd/build_external/dosfstools/BUILD.bazel b/base/cvd/build_external/dosfstools/BUILD.bazel index 1d9da352468..1ba1597a458 100644 --- a/base/cvd/build_external/dosfstools/BUILD.bazel +++ b/base/cvd/build_external/dosfstools/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@dosfstools//:__subpackages__"], ) diff --git a/base/cvd/build_external/dosfstools/BUILD.dosfstools.bazel b/base/cvd/build_external/dosfstools/BUILD.dosfstools.bazel index 2dd592067c7..4d1d3d1c817 100644 --- a/base/cvd/build_external/dosfstools/BUILD.dosfstools.bazel +++ b/base/cvd/build_external/dosfstools/BUILD.dosfstools.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/build_external/e2fsprogs/BUILD.bazel b/base/cvd/build_external/e2fsprogs/BUILD.bazel index 87b84cd7072..b57c6b7078f 100644 --- a/base/cvd/build_external/e2fsprogs/BUILD.bazel +++ b/base/cvd/build_external/e2fsprogs/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@e2fsprogs//:__subpackages__", diff --git a/base/cvd/build_external/expat/BUILD.bazel b/base/cvd/build_external/expat/BUILD.bazel index 17fbedcab9c..6b6f077fa3c 100644 --- a/base/cvd/build_external/expat/BUILD.bazel +++ b/base/cvd/build_external/expat/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@expat//:__subpackages__", diff --git a/base/cvd/build_external/freetype/BUILD.bazel b/base/cvd/build_external/freetype/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/freetype/add_build_file.patch b/base/cvd/build_external/freetype/add_build_file.patch new file mode 100644 index 00000000000..44b4f9476ba --- /dev/null +++ b/base/cvd/build_external/freetype/add_build_file.patch @@ -0,0 +1,67 @@ +--- /dev/null ++++ BUILD.bazel +@@ -0,0 +1,64 @@ ++licenses(["notice"]) ++ ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++ ++# n.b. srcs comes from the BASE_SRCS variable in upstream CMakeLists.txt ++# (c.f. https://gitlab.freedesktop.org/freetype/freetype/-/blob/VER-2-13-3/CMakeLists.txt) ++cc_library( ++ name = "freetype", ++ srcs = [ ++ "src/autofit/autofit.c", ++ "src/base/ftbase.c", ++ "src/base/ftbbox.c", ++ "src/base/ftbdf.c", ++ "src/base/ftbitmap.c", ++ "src/base/ftcid.c", ++ "src/base/ftdebug.c", ++ "src/base/ftfstype.c", ++ "src/base/ftgasp.c", ++ "src/base/ftglyph.c", ++ "src/base/ftgxval.c", ++ "src/base/ftinit.c", ++ "src/base/ftmm.c", ++ "src/base/ftotval.c", ++ "src/base/ftpatent.c", ++ "src/base/ftpfr.c", ++ "src/base/ftstroke.c", ++ "src/base/ftsynth.c", ++ "src/base/ftsystem.c", ++ "src/base/fttype1.c", ++ "src/base/ftwinfnt.c", ++ "src/bdf/bdf.c", ++ "src/bzip2/ftbzip2.c", ++ "src/cache/ftcache.c", ++ "src/cff/cff.c", ++ "src/cid/type1cid.c", ++ "src/gzip/ftgzip.c", ++ "src/lzw/ftlzw.c", ++ "src/pcf/pcf.c", ++ "src/pfr/pfr.c", ++ "src/psaux/psaux.c", ++ "src/pshinter/pshinter.c", ++ "src/psnames/psnames.c", ++ "src/raster/raster.c", ++ "src/sdf/sdf.c", ++ "src/sfnt/sfnt.c", ++ "src/smooth/smooth.c", ++ "src/svg/svg.c", ++ "src/truetype/truetype.c", ++ "src/type1/type1.c", ++ "src/type42/type42.c", ++ "src/winfonts/winfnt.c", ++ ], ++ hdrs = glob([ ++ "src/**/*.h", ++ "include/**/*.h", ++ ]), ++ copts = [ ++ "-DFT2_BUILD_LIBRARY", ++ "-UDEBUG", ++ ], ++ includes = ["include"], ++ textual_hdrs = glob(["src/**/*.c"]), ++ visibility = ["//visibility:public"], ++) diff --git a/base/cvd/build_external/freetype/module_dot_bazel.patch b/base/cvd/build_external/freetype/module_dot_bazel.patch new file mode 100644 index 00000000000..1a64d899a31 --- /dev/null +++ b/base/cvd/build_external/freetype/module_dot_bazel.patch @@ -0,0 +1,9 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,6 @@ ++module( ++ name = "freetype", ++ version = "2.13.3", ++) ++ ++bazel_dep(name = "rules_cc", version = "0.2.16") diff --git a/base/cvd/build_external/fruit/BUILD.bazel b/base/cvd/build_external/fruit/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/fruit/PATCH.fruit.bazel9.patch b/base/cvd/build_external/fruit/PATCH.fruit.bazel9.patch new file mode 100644 index 00000000000..a81d979defa --- /dev/null +++ b/base/cvd/build_external/fruit/PATCH.fruit.bazel9.patch @@ -0,0 +1,9 @@ +diff --git a/BUILD b/BUILD +index d93719c..6cc7756 100644 +--- a/BUILD ++++ b/BUILD +@@ -1,3 +1,4 @@ ++load("@rules_cc//cc:cc_library.bzl", "cc_library") + + package(default_visibility = ["//visibility:public"]) + licenses(["notice"]) diff --git a/base/cvd/build_external/gflags/BUILD.bazel b/base/cvd/build_external/gflags/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/gflags/PATCH.gflags.bazel9.patch b/base/cvd/build_external/gflags/PATCH.gflags.bazel9.patch new file mode 100644 index 00000000000..85cd2cf2bd1 --- /dev/null +++ b/base/cvd/build_external/gflags/PATCH.gflags.bazel9.patch @@ -0,0 +1,10 @@ +diff --git a/bazel/expanded_template/BUILD b/bazel/expanded_template/BUILD +index e9b6504..ac6c663 100644 +--- a/bazel/expanded_template/BUILD ++++ b/bazel/expanded_template/BUILD +@@ -1,3 +1,5 @@ ++load("@rules_cc//cc:cc_binary.bzl", "cc_binary") ++ + cc_binary( + name = "expand_template", + srcs = ["expand_template.cc"], diff --git a/base/cvd/build_external/gfxstream/PATCH.gfxstream.build_variables.patch b/base/cvd/build_external/gfxstream/PATCH.gfxstream.build_variables.patch index 7f86494187e..d6a37e4162a 100644 --- a/base/cvd/build_external/gfxstream/PATCH.gfxstream.build_variables.patch +++ b/base/cvd/build_external/gfxstream/PATCH.gfxstream.build_variables.patch @@ -2,7 +2,7 @@ diff --git a/build_variables.bzl b/build_variables.bzl index 113342840..94e0a8377 100644 --- a/build_variables.bzl +++ b/build_variables.bzl -@@ -9,7 +9,13 @@ GFXSTREAM_HOST_COPTS = [ +@@ -9,7 +9,15 @@ GFXSTREAM_HOST_COPTS = [ ], "//conditions:default": [ "-fno-exceptions", @@ -13,6 +13,8 @@ index 113342840..94e0a8377 100644 + "-Wno-unused-const-variable", + "-Wno-unused-function", + "-Wno-unused-private-field", ++ "-Wno-return-type-c-linkage", ++ "-Wno-modules-import-nested-redundant", + ], }) GFXSTREAM_HOST_VK_DEFINES = [ diff --git a/base/cvd/build_external/grpc/BUILD.bazel b/base/cvd/build_external/grpc/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/grpc/PATCH.grpc.bazel9.patch b/base/cvd/build_external/grpc/PATCH.grpc.bazel9.patch new file mode 100644 index 00000000000..bc5058bf559 --- /dev/null +++ b/base/cvd/build_external/grpc/PATCH.grpc.bazel9.patch @@ -0,0 +1,167 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index dbb69536c0..000d747380 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -49,7 +49,7 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.5") + # Development dependencies + # ======================== + bazel_dep(name = "google_benchmark", version = "1.9.0", dev_dependency = True, repo_name = "com_github_google_benchmark") +-bazel_dep(name = "rules_shell", version = "0.4.0", dev_dependency = True) ++bazel_dep(name = "rules_shell", version = "0.4.0") + + # Python dependencies + # =================== +@@ -105,3 +105,6 @@ include("//bazel:com_google_fuzztest.MODULE.bazel") + + # Provides repo @grpc_custom_exec_properties. + include("//bazel:grpc_custom_exec_properties.MODULE.bazel") ++ ++cc_compatibility_proxy = use_extension("@rules_cc//cc:extensions.bzl", "compatibility_proxy") ++use_repo(cc_compatibility_proxy, "cc_compatibility_proxy") +diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl +index 3f4f5347fb..5f408f351e 100644 +--- a/bazel/cc_grpc_library.bzl ++++ b/bazel/cc_grpc_library.bzl +@@ -13,6 +13,7 @@ + # limitations under the License. + """Generates and compiles C++ grpc stubs from proto_library rules.""" + ++load("@cc_compatibility_proxy//:proxy.bzl", "cc_library") + load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") + load("@rules_proto//proto:defs.bzl", "proto_library") + load("//bazel:generate_cc.bzl", "generate_cc") +@@ -112,7 +113,7 @@ def cc_grpc_library( + **kwargs + ) + +- native.cc_library( ++ cc_library( + name = name, + srcs = [":" + codegen_grpc_target], + hdrs = [":" + codegen_grpc_target], +diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl +index 6ee535f858..ddba2fd696 100644 +--- a/bazel/grpc_build_system.bzl ++++ b/bazel/grpc_build_system.bzl +@@ -32,8 +32,14 @@ load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") + load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner") + load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") + load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library") ++load("@rules_cc//cc:cc_binary.bzl", "cc_binary") ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++load("@rules_cc//cc:cc_test.bzl", "cc_test") ++load("@rules_cc//cc:objc_library.bzl", "objc_library") + load("@rules_proto//proto:defs.bzl", "proto_library") + load("@rules_python//python:defs.bzl", "py_binary") ++load("@rules_shell//shell:sh_binary.bzl", "sh_binary") ++load("@rules_shell//shell:sh_test.bzl", "sh_test") + load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") + load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS") + load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS") +@@ -151,7 +157,7 @@ def grpc_cc_library( + # See b/391433873. + if "fuzztest" in external_deps and "grpc-fuzztest" not in tags: + tags = tags + ["grpc-fuzztest"] +- native.cc_library( ++ cc_library( + name = name, + srcs = srcs, + defines = defines + +@@ -186,7 +192,7 @@ def grpc_cc_library( + ) + + def grpc_proto_plugin(name, srcs = [], deps = []): +- native.cc_binary( ++ cc_binary( + name = name + "_native", + srcs = srcs, + deps = deps, +@@ -289,7 +295,7 @@ def ios_cc_test( + device_type = "iPhone X", + ) + if not any([t for t in tags if t.startswith("no_test_ios")]): +- native.objc_library( ++ objc_library( + name = test_lib_ios, + srcs = kwargs.get("srcs"), + deps = kwargs.get("deps"), +@@ -582,7 +588,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data + **test_args + ) + +- native.cc_library( ++ cc_library( + name = "%s_TEST_LIBRARY" % name, + testonly = 1, + srcs = srcs, +@@ -596,7 +602,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data + fail("srcs changed") + if poller_config["deps"] != core_deps: + fail("deps changed: %r --> %r" % (deps, poller_config["deps"])) +- native.cc_test( ++ cc_test( + name = poller_config["name"], + deps = ["%s_TEST_LIBRARY" % name], + tags = poller_config["tags"], +@@ -626,7 +632,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da + """ + visibility = _update_visibility(visibility) + copts = [] +- native.cc_binary( ++ cc_binary( + name = name, + srcs = srcs, + args = args, +@@ -693,7 +699,7 @@ def grpc_sh_test(name, srcs = [], args = [], data = [], uses_polling = True, siz + } + + for poller_config in expand_tests(name, srcs, [], tags, args, exclude_pollers, uses_polling, uses_event_engine, flaky): +- native.sh_test( ++ sh_test( + name = poller_config["name"], + srcs = poller_config["srcs"], + deps = poller_config["deps"], +@@ -705,7 +711,7 @@ def grpc_sh_test(name, srcs = [], args = [], data = [], uses_polling = True, siz + ) + + def grpc_sh_binary(name, srcs, data = []): +- native.sh_binary( ++ sh_binary( + name = name, + srcs = srcs, + data = data, +@@ -793,7 +799,7 @@ def grpc_objc_library( + visibility: visibility, default to public + """ + +- native.objc_library( ++ objc_library( + name = name, + hdrs = hdrs, + srcs = srcs, +diff --git a/third_party/address_sorting/address_sorting.bzl b/third_party/address_sorting/address_sorting.bzl +index 05b4c6d847..c774a80659 100644 +--- a/third_party/address_sorting/address_sorting.bzl ++++ b/third_party/address_sorting/address_sorting.bzl +@@ -28,8 +28,10 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++ + def address_sorting_cc_library(name, srcs, hdrs, copts, includes, linkopts=[]): +- native.cc_library( ++ cc_library( + name = name, + srcs = srcs, + hdrs = hdrs, +diff --git a/third_party/xxhash/BUILD b/third_party/xxhash/BUILD +index 91d7bd0566..8c32e0bfc2 100644 +--- a/third_party/xxhash/BUILD ++++ b/third_party/xxhash/BUILD +@@ -1,3 +1,5 @@ ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++ + # TODO(donnadionne): describe this package. + cc_library( + name = "xxhash", diff --git a/base/cvd/build_external/jsoncpp/BUILD.bazel b/base/cvd/build_external/jsoncpp/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/jsoncpp/PATCH.jsoncpp.bazel9.patch b/base/cvd/build_external/jsoncpp/PATCH.jsoncpp.bazel9.patch new file mode 100644 index 00000000000..e7698c6fe63 --- /dev/null +++ b/base/cvd/build_external/jsoncpp/PATCH.jsoncpp.bazel9.patch @@ -0,0 +1,37 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 2227fee..e158405 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -1,6 +1,7 @@ + licenses(["unencumbered"]) # Public Domain or MIT + + load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") ++load("@rules_cc//cc:cc_library.bzl", "cc_library") + + exports_files(["LICENSE"]) + +diff --git a/MODULE.bazel b/MODULE.bazel +index e60fa06..f8f8993 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -17,3 +17,8 @@ bazel_dep( + name = "bazel_skylib", + version = "1.7.1", + ) ++ ++bazel_dep( ++ name = "rules_cc", ++ version = "0.2.14", ++) +diff --git a/include/json/config.h b/include/json/config.h +index 7f6e243..937813d 100644 +--- a/include/json/config.h ++++ b/include/json/config.h +@@ -122,7 +122,6 @@ using UInt64 = uint64_t; + #endif // if defined(_MSC_VER) + using LargestInt = Int64; + using LargestUInt = UInt64; +-#define JSON_HAS_INT64 + #endif // if defined(JSON_NO_INT64) + + template diff --git a/base/cvd/build_external/libcap/BUILD.bazel b/base/cvd/build_external/libcap/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/libcap/module_dot_bazel.patch b/base/cvd/build_external/libcap/module_dot_bazel.patch new file mode 100644 index 00000000000..95338918558 --- /dev/null +++ b/base/cvd/build_external/libcap/module_dot_bazel.patch @@ -0,0 +1,9 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,6 @@ ++module( ++ name = "libcap", ++ version = "2.27", ++) ++ ++bazel_dep(name = "rules_cc", version = "0.2.16") diff --git a/base/cvd/build_external/libcbor/BUILD.bazel b/base/cvd/build_external/libcbor/BUILD.bazel index 2bf9a487085..cd865462308 100644 --- a/base/cvd/build_external/libcbor/BUILD.bazel +++ b/base/cvd/build_external/libcbor/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@libcbor//:__subpackages__", diff --git a/base/cvd/build_external/libsrtp2_config/BUILD.bazel b/base/cvd/build_external/libsrtp2_config/BUILD.bazel index 53c8a30bf48..67ba0164c4e 100644 --- a/base/cvd/build_external/libsrtp2_config/BUILD.bazel +++ b/base/cvd/build_external/libsrtp2_config/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//visibility:public", diff --git a/base/cvd/build_external/libunwind/BUILD.bazel b/base/cvd/build_external/libunwind/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/libunwind/module_dot_bazel.patch b/base/cvd/build_external/libunwind/module_dot_bazel.patch new file mode 100644 index 00000000000..5c6a30ab513 --- /dev/null +++ b/base/cvd/build_external/libunwind/module_dot_bazel.patch @@ -0,0 +1,15 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,12 @@ ++module( ++ name = "libunwind", ++ version = "1.8.1", ++ bazel_compatibility = [">=7.2.1"], # need support for "overlay" directory ++ compatibility_level = 0, ++) ++ ++bazel_dep(name = "bazel_skylib", version = "1.7.1") ++bazel_dep(name = "platforms", version = "0.0.11") ++bazel_dep(name = "rules_cc", version = "0.1.1") ++bazel_dep(name = "xz", version = "5.4.5.bcr.5") ++bazel_dep(name = "zlib", version = "1.3.1.bcr.5") diff --git a/base/cvd/build_external/libwebrtc/BUILD.bazel b/base/cvd/build_external/libwebrtc/BUILD.bazel index f99e6190219..a33e8629512 100644 --- a/base/cvd/build_external/libwebrtc/BUILD.bazel +++ b/base/cvd/build_external/libwebrtc/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//visibility:public", diff --git a/base/cvd/build_external/libwebrtc/third_party/libevent/event.h b/base/cvd/build_external/libwebrtc/third_party/libevent/event.h index 3efc1e9fead..fe069fce32a 100644 --- a/base/cvd/build_external/libwebrtc/third_party/libevent/event.h +++ b/base/cvd/build_external/libwebrtc/third_party/libevent/event.h @@ -1 +1 @@ -#include +#include "event.h" diff --git a/base/cvd/build_external/libwebsockets/BUILD.bazel b/base/cvd/build_external/libwebsockets/BUILD.bazel index 8d2876a2ed8..46a5469fec1 100644 --- a/base/cvd/build_external/libwebsockets/BUILD.bazel +++ b/base/cvd/build_external/libwebsockets/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@libwebsockets//:__subpackages__", diff --git a/base/cvd/build_external/mtools/BUILD.bazel b/base/cvd/build_external/mtools/BUILD.bazel index 632aa08f407..c21ff44c813 100644 --- a/base/cvd/build_external/mtools/BUILD.bazel +++ b/base/cvd/build_external/mtools/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@mtools//:__subpackages__", diff --git a/base/cvd/build_external/mtools/BUILD.mtools.bazel b/base/cvd/build_external/mtools/BUILD.mtools.bazel index 84c5176ff09..f7f5923d146 100644 --- a/base/cvd/build_external/mtools/BUILD.mtools.bazel +++ b/base/cvd/build_external/mtools/BUILD.mtools.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/build_external/netsim/0003-Pin-cxx.patch b/base/cvd/build_external/netsim/0003-Pin-cxx.patch index 82c6f4b74e7..d35a31ebcb6 100644 --- a/base/cvd/build_external/netsim/0003-Pin-cxx.patch +++ b/base/cvd/build_external/netsim/0003-Pin-cxx.patch @@ -7,7 +7,7 @@ index 30f705ad..3a1819d4 100644 bytes = { version = ">=1.4.0"} clap = { version = "4.1.8", default-features = false, features = ["derive", "error-context", "help", "std", "usage", "env" ] } -cxx = { version = ">=1.0.85", features = ["c++17"] } -+cxx = { version = "=1.0.188", features = ["c++17"] } ++cxx = { version = "=1.0.192", features = ["c++17"] } data-encoding = "2.4.0" futures = "0.3.30" glam = { version = "0.25.0", features = ["libm"] } diff --git a/base/cvd/build_external/rootcanal/0006-bazel9.patch b/base/cvd/build_external/rootcanal/0006-bazel9.patch new file mode 100644 index 00000000000..1e70e35e6fc --- /dev/null +++ b/base/cvd/build_external/rootcanal/0006-bazel9.patch @@ -0,0 +1,54 @@ +diff --git a/BUILD b/BUILD +index 6775c02..14aa30e 100644 +--- a/BUILD ++++ b/BUILD +@@ -2,7 +2,8 @@ + + load("@rules_cc//cc:defs.bzl", "cc_binary") + load("@rules_cc//cc:defs.bzl", "cc_library") +-load("@rules_proto//proto:defs.bzl", "proto_library") ++load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") ++load("@protobuf//bazel:proto_library.bzl", "proto_library") + load("@rules_rust//rust:defs.bzl", "rust_static_library") + + package(default_visibility = ["//visibility:private"]) +diff --git a/BUILD.fmtlib b/BUILD.fmtlib +index d237183..cbe4508 100644 +--- a/BUILD.fmtlib ++++ b/BUILD.fmtlib +@@ -1,5 +1,7 @@ + # Copyright 2023 Google Inc. All Rights Reserved. + ++load("@rules_cc//cc:defs.bzl", "cc_library") ++ + cc_library( + name = "fmtlib", + srcs = [ +diff --git a/MODULE.bazel b/MODULE.bazel +index c888365..588ef50 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -7,10 +7,9 @@ module( + + bazel_dep(name = "rules_cc", version = "0.1.0") + bazel_dep(name = "rules_rust", version = "0.57.1") +-bazel_dep(name = "rules_proto", version = "7.1.0") + bazel_dep(name = "rules_python", version = "1.1.0") + bazel_dep(name = "bazel_skylib", version = "1.7.1") +- ++bazel_dep(name = "protobuf", version = "33.4") + bazel_dep(name = "openssl", version = "3.3.1.bcr.1") + bazel_dep(name = "gflags", version = "2.2.2") + +diff --git a/packets/BUILD b/packets/BUILD +index 58285d6..83a15dd 100644 +--- a/packets/BUILD ++++ b/packets/BUILD +@@ -1,6 +1,7 @@ + # Copyright 2023 Google Inc. All Rights Reserved. + + load("@bazel_skylib//rules:run_binary.bzl", "run_binary") ++load("@rules_cc//cc:defs.bzl", "cc_library") + + package(default_visibility = ["//visibility:public"]) + exports_files(["hci_packets.pdl"]) diff --git a/base/cvd/build_external/rules_m4/BUILD.bazel b/base/cvd/build_external/rules_m4/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/sandboxed_api/PATCH.sandboxed_api.bazel9.patch b/base/cvd/build_external/sandboxed_api/PATCH.sandboxed_api.bazel9.patch new file mode 100644 index 00000000000..c08a9356e52 --- /dev/null +++ b/base/cvd/build_external/sandboxed_api/PATCH.sandboxed_api.bazel9.patch @@ -0,0 +1,21 @@ +diff --git a/sandboxed_api/bazel/proto.bzl b/sandboxed_api/bazel/proto.bzl +index bd36c886..77d0a5ee 100644 +--- a/sandboxed_api/bazel/proto.bzl ++++ b/sandboxed_api/bazel/proto.bzl +@@ -15,6 +15,7 @@ + """Generates proto targets in various languages.""" + + load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") ++load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") + load("@rules_cc//cc:cc_library.bzl", "cc_library") + + def _cc_proto_library_name_from_proto_name(name): +@@ -75,7 +76,7 @@ def sapi_proto_library( + srcs = srcs, + deps = deps, + ) +- native.cc_proto_library( ++ cc_proto_library( + name = name + "_sapi_cc_proto", + deps = [name], + ) diff --git a/base/cvd/build_external/spirv_tools/BUILD.bazel b/base/cvd/build_external/spirv_tools/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/spirv_tools/PATCH.spirv_tools.bazel9.patch b/base/cvd/build_external/spirv_tools/PATCH.spirv_tools.bazel9.patch new file mode 100644 index 00000000000..26cb8194308 --- /dev/null +++ b/base/cvd/build_external/spirv_tools/PATCH.spirv_tools.bazel9.patch @@ -0,0 +1,15 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 280d2873..31ab8ae7 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -10,6 +10,10 @@ load( + "generate_extinst_lang_headers", + "incompatible_with", + ) ++load("@rules_cc//cc:cc_binary.bzl", "cc_binary") ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++load("@rules_cc//cc:cc_test.bzl", "cc_test") ++load("@rules_python//python:defs.bzl", "py_binary") + + package( + default_visibility = ["//visibility:private"], diff --git a/base/cvd/build_external/swiftshader/BUILD.bazel b/base/cvd/build_external/swiftshader/BUILD.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/build_external/swiftshader/PATCH.swiftshader.bazel9.patch b/base/cvd/build_external/swiftshader/PATCH.swiftshader.bazel9.patch new file mode 100644 index 00000000000..336b0b60c0d --- /dev/null +++ b/base/cvd/build_external/swiftshader/PATCH.swiftshader.bazel9.patch @@ -0,0 +1,14 @@ +diff --git a/third_party/marl/BUILD.bazel b/third_party/marl/BUILD.bazel +index 297fd4464..221985901 100644 +--- a/third_party/marl/BUILD.bazel ++++ b/third_party/marl/BUILD.bazel +@@ -12,6 +12,9 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + ++load("@rules_cc//cc:cc_library.bzl", "cc_library") ++load("@rules_cc//cc:cc_test.bzl", "cc_test") ++ + config_setting( + name = "linux_x86_64", + constraint_values = [ diff --git a/base/cvd/build_external/wayland/BUILD.bazel b/base/cvd/build_external/wayland/BUILD.bazel index 4a0d0f00155..7485fed7ed8 100644 --- a/base/cvd/build_external/wayland/BUILD.bazel +++ b/base/cvd/build_external/wayland/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "@wayland//:__subpackages__", diff --git a/base/cvd/build_external/wayland/BUILD.wayland.bazel b/base/cvd/build_external/wayland/BUILD.wayland.bazel index a61bddc37b9..28d6d2e0aaf 100644 --- a/base/cvd/build_external/wayland/BUILD.wayland.bazel +++ b/base/cvd/build_external/wayland/BUILD.wayland.bazel @@ -1,4 +1,6 @@ load("@//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package( default_visibility = [ diff --git a/base/cvd/cuttlefish/bazel/rules.bzl b/base/cvd/cuttlefish/bazel/rules.bzl index cb3dca0efda..3a4ffd18746 100644 --- a/base/cvd/cuttlefish/bazel/rules.bzl +++ b/base/cvd/cuttlefish/bazel/rules.bzl @@ -14,6 +14,7 @@ load("//:build_variables.bzl", BUILD_VAR_COPTS = "COPTS") load("//tools/lint:linters.bzl", "clang_tidy_test") +load("@cc_compatibility_proxy//:proxy.bzl", "cc_binary", "cc_library", "cc_test") visibility(["//..."]) @@ -22,7 +23,7 @@ COPTS = BUILD_VAR_COPTS def _cf_cc_binary_implementation(name, clang_tidy_enabled, copts, **kwargs): if not clang_tidy_enabled and not kwargs["deprecation"]: kwargs["deprecation"] = "Not covered by clang-tidy" - native.cc_binary( + cc_binary( name = name, copts = (copts or []) + COPTS, **kwargs, @@ -36,7 +37,7 @@ def _cf_cc_binary_implementation(name, clang_tidy_enabled, copts, **kwargs): ) cf_cc_binary = macro( - inherit_attrs = native.cc_binary, + inherit_attrs = cc_binary, attrs = { "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"), "copts": attr.string_list(configurable = False, default = []), @@ -47,7 +48,7 @@ cf_cc_binary = macro( def _cf_cc_library_implementation(name, clang_tidy_enabled, copts, **kwargs): if not clang_tidy_enabled and not kwargs["deprecation"]: kwargs["deprecation"] = "Not covered by clang-tidy" - native.cc_library( + cc_library( name = name, copts = (copts or []) + COPTS, **kwargs, @@ -61,7 +62,7 @@ def _cf_cc_library_implementation(name, clang_tidy_enabled, copts, **kwargs): ) cf_cc_library = macro( - inherit_attrs = native.cc_library, + inherit_attrs = cc_library, attrs = { "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"), "copts": attr.string_list(configurable = False, default = []), @@ -72,7 +73,7 @@ cf_cc_library = macro( def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, **kwargs): if not clang_tidy_enabled and not kwargs["deprecation"]: kwargs["deprecation"] = "Not covered by clang-tidy" - native.cc_test( + cc_test( name = name, copts = (copts or []) + COPTS, **kwargs, @@ -86,7 +87,7 @@ def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, **kwargs): ) cf_cc_test = macro( - inherit_attrs = native.cc_test, + inherit_attrs = cc_test, attrs = { "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"), "copts": attr.string_list(configurable = False, default = []), diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 59b40bfc94d..286d9c4932a 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "COPTS", "cf_cc_binary", "cf_cc_library") package( diff --git a/base/cvd/cuttlefish/host/commands/casimir_control_server/BUILD.bazel b/base/cvd/cuttlefish/host/commands/casimir_control_server/BUILD.bazel index 20fa78fb095..1e11fe58621 100644 --- a/base/cvd/cuttlefish/host/commands/casimir_control_server/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/casimir_control_server/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary", "cf_cc_library") package( diff --git a/base/cvd/cuttlefish/host/commands/control_env_proxy_server/BUILD.bazel b/base/cvd/cuttlefish/host/commands/control_env_proxy_server/BUILD.bazel index 1e553770cac..67560e11ce6 100644 --- a/base/cvd/cuttlefish/host/commands/control_env_proxy_server/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/control_env_proxy_server/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") package( diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel index fa8d06f6489..ac2df38eec4 100644 --- a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_proto_grpc_go//:defs.bzl", "go_proto_compile") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel index 6bd08a563be..d8170a1cf28 100644 --- a/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//:build_variables.bzl", "COPTS") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel index 863d4f7e25c..f5a589cbc6f 100644 --- a/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") package( diff --git a/base/cvd/cuttlefish/host/commands/echo_server/BUILD.bazel b/base/cvd/cuttlefish/host/commands/echo_server/BUILD.bazel index a027accfbc8..e3a899adcbb 100644 --- a/base/cvd/cuttlefish/host/commands/echo_server/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/echo_server/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") package( diff --git a/base/cvd/cuttlefish/host/commands/extract_ikconfig/BUILD.bazel b/base/cvd/cuttlefish/host/commands/extract_ikconfig/BUILD.bazel index e22fb4b9d87..dbae8fbc6dc 100644 --- a/base/cvd/cuttlefish/host/commands/extract_ikconfig/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/extract_ikconfig/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_shell//shell:sh_binary.bzl", "sh_binary") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/cuttlefish/host/commands/extract_vmlinux/BUILD.bazel b/base/cvd/cuttlefish/host/commands/extract_vmlinux/BUILD.bazel index 84537982b86..a1a2baf1a32 100644 --- a/base/cvd/cuttlefish/host/commands/extract_vmlinux/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/extract_vmlinux/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_shell//shell:sh_binary.bzl", "sh_binary") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/cuttlefish/host/commands/gnss_grpc_proxy/BUILD.bazel b/base/cvd/cuttlefish/host/commands/gnss_grpc_proxy/BUILD.bazel index 4f7b4642da6..fba8357f052 100644 --- a/base/cvd/cuttlefish/host/commands/gnss_grpc_proxy/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/gnss_grpc_proxy/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") package( diff --git a/base/cvd/cuttlefish/host/commands/openwrt_control_server/BUILD.bazel b/base/cvd/cuttlefish/host/commands/openwrt_control_server/BUILD.bazel index 5b54f624104..3612f11f08b 100644 --- a/base/cvd/cuttlefish/host/commands/openwrt_control_server/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/openwrt_control_server/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") package( diff --git a/base/cvd/cuttlefish/host/commands/screen_recording_server/BUILD.bazel b/base/cvd/cuttlefish/host/commands/screen_recording_server/BUILD.bazel index 19941504b7c..4158123b2c2 100644 --- a/base/cvd/cuttlefish/host/commands/screen_recording_server/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/screen_recording_server/BUILD.bazel @@ -1,4 +1,6 @@ load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") package( diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/BUILD.bazel b/base/cvd/cuttlefish/host/frontend/webrtc/BUILD.bazel index 665e49ce3a9..7ea60c70d10 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/BUILD.bazel +++ b/base/cvd/cuttlefish/host/frontend/webrtc/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary", "cf_cc_library") package( diff --git a/base/cvd/cuttlefish/host/graphics_detector/BUILD.bazel b/base/cvd/cuttlefish/host/graphics_detector/BUILD.bazel index 7135b4022c9..b794e312133 100644 --- a/base/cvd/cuttlefish/host/graphics_detector/BUILD.bazel +++ b/base/cvd/cuttlefish/host/graphics_detector/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//:build_variables.bzl", "COPTS") load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary") diff --git a/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel b/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel index 25ff81ba9fc..f3103c368ad 100644 --- a/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel +++ b/base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library") package( diff --git a/base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel b/base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel index 131cee24c78..dfb7b736c05 100644 --- a/base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel +++ b/base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "COPTS", "cf_cc_library") package( diff --git a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel index 9593566e142..b37c5d19e51 100644 --- a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel +++ b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel @@ -1,3 +1,5 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") package( diff --git a/base/cvd/cuttlefish/package/BUILD.bazel b/base/cvd/cuttlefish/package/BUILD.bazel index e753f9f6cab..e3efc2dcca8 100644 --- a/base/cvd/cuttlefish/package/BUILD.bazel +++ b/base/cvd/cuttlefish/package/BUILD.bazel @@ -74,8 +74,8 @@ package_files( "cuttlefish-common/bin/modem_simulator": "//cuttlefish/host/commands/modem_simulator", "cuttlefish-common/bin/ms-tpm-20-ref": "@ms-tpm-20-ref//:simulator", "cuttlefish-common/bin/mtools": "@mtools//:mtools", - "cuttlefish-common/bin/netsim": "@android_tools_netsim//:netsim", - "cuttlefish-common/bin/netsimd": "@android_tools_netsim//:netsimd", + # "cuttlefish-common/bin/netsim": "@android_tools_netsim//:netsim", # TODO: schuffelen - fix for bazel 9 + # "cuttlefish-common/bin/netsimd": "@android_tools_netsim//:netsimd", # TODO: schuffelen - fix for bazel 9 "cuttlefish-common/bin/openwrt_control_server": "//cuttlefish/host/commands/openwrt_control_server", "cuttlefish-common/bin/operator_proxy": "//cuttlefish/host/frontend/operator_proxy", "cuttlefish-common/bin/pica": "@netsim_crates//:pica__pica", diff --git a/base/cvd/external_proto/BUILD.bazel b/base/cvd/external_proto/BUILD.bazel index e28063958b5..5e6b2b218ac 100644 --- a/base/cvd/external_proto/BUILD.bazel +++ b/base/cvd/external_proto/BUILD.bazel @@ -1,3 +1,6 @@ +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/fec/BUILD.bazel b/base/cvd/fec/BUILD.bazel index f402de18829..91c078614b3 100644 --- a/base/cvd/fec/BUILD.bazel +++ b/base/cvd/fec/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/libbase/BUILD.bazel b/base/cvd/libbase/BUILD.bazel index efe8984e9e1..0fb9f6c5bdf 100644 --- a/base/cvd/libbase/BUILD.bazel +++ b/base/cvd/libbase/BUILD.bazel @@ -1,4 +1,5 @@ load("//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package( default_visibility = [ diff --git a/base/cvd/libext4_utils/BUILD.bazel b/base/cvd/libext4_utils/BUILD.bazel index c742eacfe17..17b73fc0f75 100644 --- a/base/cvd/libext4_utils/BUILD.bazel +++ b/base/cvd/libext4_utils/BUILD.bazel @@ -1,4 +1,5 @@ load("//:build_variables.bzl", "COPTS") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package( default_visibility = [ diff --git a/base/cvd/libext4_utils/include/ext4_utils/ext4_kernel_headers.h b/base/cvd/libext4_utils/include/ext4_utils/ext4_kernel_headers.h index ebdf202f483..5b99b7cfd2d 100644 --- a/base/cvd/libext4_utils/include/ext4_utils/ext4_kernel_headers.h +++ b/base/cvd/libext4_utils/include/ext4_utils/ext4_kernel_headers.h @@ -22,6 +22,8 @@ #ifdef __BIONIC__ #include #else +#include +/* #define __le64 uint64_t #define __le32 uint32_t #define __le16 uint16_t @@ -34,6 +36,7 @@ #define __u32 uint32_t #define __u16 uint16_t #define __u8 uint8_t +*/ #endif #include "ext4_utils/ext4.h" diff --git a/base/cvd/libext4_utils/include/ext4_utils/jbd2.h b/base/cvd/libext4_utils/include/ext4_utils/jbd2.h index 6b7b161c457..b8a8dc3045c 100644 --- a/base/cvd/libext4_utils/include/ext4_utils/jbd2.h +++ b/base/cvd/libext4_utils/include/ext4_utils/jbd2.h @@ -12,6 +12,8 @@ #ifndef _LINUX_JBD2_H #define _LINUX_JBD2_H +#include + #define JBD2_DEBUG #define jfs_debug jbd_debug diff --git a/base/cvd/libext4_utils/include/ext4_utils/xattr.h b/base/cvd/libext4_utils/include/ext4_utils/xattr.h index 4251c28824e..611303f2757 100644 --- a/base/cvd/libext4_utils/include/ext4_utils/xattr.h +++ b/base/cvd/libext4_utils/include/ext4_utils/xattr.h @@ -1,4 +1,4 @@ -#include +#include #ifndef _SYSTEM_EXTRAS_EXT4_UTILS_XATTR_H #define _SYSTEM_EXTRAS_EXT4_UTILS_XATTR_H 1 diff --git a/base/cvd/libffi/linux-arm64/BUILD.bazel b/base/cvd/libffi/linux-arm64/BUILD.bazel index c587a1497fb..ae42f0ddcb7 100644 --- a/base/cvd/libffi/linux-arm64/BUILD.bazel +++ b/base/cvd/libffi/linux-arm64/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/libffi/linux-x86/BUILD.bazel b/base/cvd/libffi/linux-x86/BUILD.bazel index 6570ac4f3ba..0808770f60f 100644 --- a/base/cvd/libffi/linux-x86/BUILD.bazel +++ b/base/cvd/libffi/linux-x86/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/linux_headers/BUILD.bazel b/base/cvd/linux_headers/BUILD.bazel index 4d3245e508d..c9776bf67d8 100644 --- a/base/cvd/linux_headers/BUILD.bazel +++ b/base/cvd/linux_headers/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = [ "//:android_cuttlefish", diff --git a/base/cvd/teeui/libteeui/BUILD.bazel b/base/cvd/teeui/libteeui/BUILD.bazel index 87ab8b768d0..4776f2e2fcb 100644 --- a/base/cvd/teeui/libteeui/BUILD.bazel +++ b/base/cvd/teeui/libteeui/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/teeui/libteeui/prebuilt/localization/BUILD.bazel b/base/cvd/teeui/libteeui/prebuilt/localization/BUILD.bazel index 72d8dae939e..4ce07833930 100644 --- a/base/cvd/teeui/libteeui/prebuilt/localization/BUILD.bazel +++ b/base/cvd/teeui/libteeui/prebuilt/localization/BUILD.bazel @@ -1,5 +1,7 @@ load("//:build_variables.bzl", "COPTS") load("//tools/lint:linters.bzl", "clang_tidy_test") +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:cc_test.bzl", "cc_test") package( default_visibility = ["//:android_cuttlefish"], diff --git a/base/cvd/toolchain/BUILD.bazel b/base/cvd/toolchain/BUILD.bazel index 973cc94371a..24e4d9c3ded 100644 --- a/base/cvd/toolchain/BUILD.bazel +++ b/base/cvd/toolchain/BUILD.bazel @@ -1,86 +1,86 @@ -load(":cc_toolchain_macro.bzl", "linux_local_clang") +# load(":cc_toolchain_macro.bzl", "linux_local_clang") package(default_visibility = ["//visibility:public"]) filegroup(name = "empty") -linux_local_clang( - name = "linux_local_clang_19", - exec_compatible_with = [ - "@clang_detector//:clang_19_present", - "@platforms//os:linux", - ], - version = 19, -) - -linux_local_clang( - name = "linux_local_clang_18", - exec_compatible_with = [ - "@clang_detector//:clang_18_present", - "@platforms//os:linux", - ], - version = 18, -) - -linux_local_clang( - name = "linux_local_clang_17", - exec_compatible_with = [ - "@clang_detector//:clang_17_present", - "@platforms//os:linux", - ], - version = 17, -) - -linux_local_clang( - name = "linux_local_clang_16", - exec_compatible_with = [ - "@clang_detector//:clang_16_present", - "@platforms//os:linux", - ], - version = 16, -) - -linux_local_clang( - name = "linux_local_clang_15", - exec_compatible_with = [ - "@clang_detector//:clang_15_present", - "@platforms//os:linux", - ], - version = 15, -) - -linux_local_clang( - name = "linux_local_clang_14", - exec_compatible_with = [ - "@clang_detector//:clang_14_present", - "@platforms//os:linux", - ], - version = 14, -) - -linux_local_clang( - name = "linux_local_clang_13", - exec_compatible_with = [ - "@clang_detector//:clang_13_present", - "@platforms//os:linux", - ], - version = 13, -) - -linux_local_clang( - name = "linux_local_clang_12", - exec_compatible_with = [ - "@clang_detector//:clang_12_present", - "@platforms//os:linux", - ], - version = 12, -) - -linux_local_clang( - name = "linux_local_clang_11", - exec_compatible_with = [ - "@clang_detector//:clang_11_present", - "@platforms//os:linux", - ], - version = 11, -) +# linux_local_clang( +# name = "linux_local_clang_19", +# exec_compatible_with = [ +# "@clang_detector//:clang_19_present", +# "@platforms//os:linux", +# ], +# version = 19, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_18", +# exec_compatible_with = [ +# "@clang_detector//:clang_18_present", +# "@platforms//os:linux", +# ], +# version = 18, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_17", +# exec_compatible_with = [ +# "@clang_detector//:clang_17_present", +# "@platforms//os:linux", +# ], +# version = 17, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_16", +# exec_compatible_with = [ +# "@clang_detector//:clang_16_present", +# "@platforms//os:linux", +# ], +# version = 16, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_15", +# exec_compatible_with = [ +# "@clang_detector//:clang_15_present", +# "@platforms//os:linux", +# ], +# version = 15, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_14", +# exec_compatible_with = [ +# "@clang_detector//:clang_14_present", +# "@platforms//os:linux", +# ], +# version = 14, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_13", +# exec_compatible_with = [ +# "@clang_detector//:clang_13_present", +# "@platforms//os:linux", +# ], +# version = 13, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_12", +# exec_compatible_with = [ +# "@clang_detector//:clang_12_present", +# "@platforms//os:linux", +# ], +# version = 12, +# ) +# +# linux_local_clang( +# name = "linux_local_clang_11", +# exec_compatible_with = [ +# "@clang_detector//:clang_11_present", +# "@platforms//os:linux", +# ], +# version = 11, +# ) diff --git a/base/cvd/toolchain/cc_toolchain_config.bzl b/base/cvd/toolchain/cc_toolchain_config.bzl index ac072ff9747..9c35ace79fe 100644 --- a/base/cvd/toolchain/cc_toolchain_config.bzl +++ b/base/cvd/toolchain/cc_toolchain_config.bzl @@ -105,10 +105,10 @@ def _impl(ctx): # Relevant documentation: # - https://bazel.build/rules/lib/globals/bzl.html#rule # - https://bazel.build/rules/lib/toplevel/attr.html#int -linux_local_clang_toolchain_config = rule( - implementation = _impl, - attrs = { - "version": attr.int(mandatory = True), - }, - provides = [CcToolchainConfigInfo], -) +# linux_local_clang_toolchain_config = rule( +# implementation = _impl, +# attrs = { +# "version": attr.int(mandatory = True), +# }, +# provides = [CcToolchainConfigInfo], +# ) diff --git a/base/cvd/toolchain/cc_toolchain_macro.bzl b/base/cvd/toolchain/cc_toolchain_macro.bzl index 7377bb7202c..dcdc93fc062 100644 --- a/base/cvd/toolchain/cc_toolchain_macro.bzl +++ b/base/cvd/toolchain/cc_toolchain_macro.bzl @@ -1,38 +1,38 @@ -load(":cc_toolchain_config.bzl", "linux_local_clang_toolchain_config") +# load(":cc_toolchain_config.bzl", "linux_local_clang_toolchain_config") # Relevant documentation: # - https://bazel.build/extending/macros # - https://bazel.build/extending/toolchains # - https://bazel.build/reference/be/platforms-and-toolchains#toolchain # - https://bazel.build/tutorials/ccp-toolchain-config -def _linux_local_clang_impl(name, visibility, exec_compatible_with, version, **kwargs): - linux_local_clang_toolchain_config( - name = name + "_config", - visibility = ["//visibility:private"], - version = version, - ) - native.cc_toolchain( - name = name + "_cc_toolchain", - visibility = ["//visibility:private"], - toolchain_identifier = name, - toolchain_config = ":" + name + "_config", - all_files = ":empty", - compiler_files = ":empty", - dwp_files = ":empty", - linker_files = ":empty", - objcopy_files = ":empty", - strip_files = ":empty", - supports_param_files = 0, - ) - native.toolchain( - name = name, - visibility = visibility, - toolchain = ":" + name + "_cc_toolchain", - toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", - exec_compatible_with = exec_compatible_with, - target_compatible_with = ["@platforms//os:linux"], - **kwargs, - ) +# def _linux_local_clang_impl(name, visibility, exec_compatible_with, version, **kwargs): +# linux_local_clang_toolchain_config( +# name = name + "_config", +# visibility = ["//visibility:private"], +# version = version, +# ) +# native.cc_toolchain( +# name = name + "_cc_toolchain", +# visibility = ["//visibility:private"], +# toolchain_identifier = name, +# toolchain_config = ":" + name + "_config", +# all_files = ":empty", +# compiler_files = ":empty", +# dwp_files = ":empty", +# linker_files = ":empty", +# objcopy_files = ":empty", +# strip_files = ":empty", +# supports_param_files = 0, +# ) +# native.toolchain( +# name = name, +# visibility = visibility, +# toolchain = ":" + name + "_cc_toolchain", +# toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", +# exec_compatible_with = exec_compatible_with, +# target_compatible_with = ["@platforms//os:linux"], +# **kwargs, +# ) # Defines a compiler toolchain that calls /usr/bin/clang-{version} to compile and link c++. # @@ -40,10 +40,10 @@ def _linux_local_clang_impl(name, visibility, exec_compatible_with, version, **k # - https://bazel.build/rules/lib/globals/bzl.html#macro # - https://bazel.build/rules/lib/toplevel/attr#int # - https://bazel.build/rules/lib/toplevel/attr#label_list -linux_local_clang = macro( - attrs = { - "exec_compatible_with": attr.label_list(configurable = False), - "version": attr.int(configurable = False, mandatory = True), - }, - implementation = _linux_local_clang_impl, -) +# linux_local_clang = macro( +# attrs = { +# "exec_compatible_with": attr.label_list(configurable = False), +# "version": attr.int(configurable = False, mandatory = True), +# }, +# implementation = _linux_local_clang_impl, +# ) diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/.gitignore b/base/cvd/vendor_src/+git_repository+f2fs_tools/.gitignore similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/.gitignore rename to base/cvd/vendor_src/+git_repository+f2fs_tools/.gitignore diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/AUTHORS b/base/cvd/vendor_src/+git_repository+f2fs_tools/AUTHORS similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/AUTHORS rename to base/cvd/vendor_src/+git_repository+f2fs_tools/AUTHORS diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/BUILD.bazel b/base/cvd/vendor_src/+git_repository+f2fs_tools/BUILD.bazel similarity index 95% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/BUILD.bazel rename to base/cvd/vendor_src/+git_repository+f2fs_tools/BUILD.bazel index 0f8c06c470b..5376e09ee17 100755 --- a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/BUILD.bazel +++ b/base/cvd/vendor_src/+git_repository+f2fs_tools/BUILD.bazel @@ -1,3 +1,6 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package( default_visibility = ["@//:android_cuttlefish"], ) diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/COPYING b/base/cvd/vendor_src/+git_repository+f2fs_tools/COPYING similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/COPYING rename to base/cvd/vendor_src/+git_repository+f2fs_tools/COPYING diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/ChangeLog b/base/cvd/vendor_src/+git_repository+f2fs_tools/ChangeLog similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/ChangeLog rename to base/cvd/vendor_src/+git_repository+f2fs_tools/ChangeLog diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/README b/base/cvd/vendor_src/+git_repository+f2fs_tools/README similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/README rename to base/cvd/vendor_src/+git_repository+f2fs_tools/README diff --git a/base/cvd/vendor_src/+git_repository+f2fs_tools/REPO.bazel b/base/cvd/vendor_src/+git_repository+f2fs_tools/REPO.bazel new file mode 100644 index 00000000000..e69de29bb2d diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/VERSION b/base/cvd/vendor_src/+git_repository+f2fs_tools/VERSION similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/VERSION rename to base/cvd/vendor_src/+git_repository+f2fs_tools/VERSION diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/VERSIONING b/base/cvd/vendor_src/+git_repository+f2fs_tools/VERSIONING similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/VERSIONING rename to base/cvd/vendor_src/+git_repository+f2fs_tools/VERSIONING diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/autogen.sh b/base/cvd/vendor_src/+git_repository+f2fs_tools/autogen.sh similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/autogen.sh rename to base/cvd/vendor_src/+git_repository+f2fs_tools/autogen.sh diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/configure.ac b/base/cvd/vendor_src/+git_repository+f2fs_tools/configure.ac similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/configure.ac rename to base/cvd/vendor_src/+git_repository+f2fs_tools/configure.ac diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/common.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/common.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/common.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/common.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/compress.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/compress.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/compress.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/compress.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/compress.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/compress.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/compress.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/compress.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/defrag.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/defrag.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/defrag.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/defrag.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dict.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dict.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dict.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dict.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dict.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dict.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dict.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dict.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dir.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dir.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dir.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dir.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dqblk_v2.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dqblk_v2.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dqblk_v2.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dqblk_v2.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dump.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dump.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/dump.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/dump.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/f2fs.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/f2fs.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/f2fs.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/f2fs.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/fsck.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/fsck.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/fsck.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/fsck.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/fsck.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/fsck.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/fsck.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/fsck.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/inject.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/inject.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/inject.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/inject.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/inject.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/inject.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/inject.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/inject.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/main.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/main.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/main.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/main.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/mkquota.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/mkquota.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/mkquota.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/mkquota.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/mount.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/mount.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/mount.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/mount.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/node.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/node.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/node.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/node.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/node.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/node.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/node.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/node.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_tree.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_tree.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_tree.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_tree.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_tree.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_tree.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_tree.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_tree.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_v2.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_v2.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_v2.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_v2.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_v2.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_v2.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/quotaio_v2.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/quotaio_v2.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/resize.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/resize.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/resize.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/resize.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/segment.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/segment.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/segment.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/segment.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/sload.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/sload.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/sload.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/sload.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/xattr.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/xattr.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/xattr.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/xattr.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/xattr.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/xattr.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/fsck/xattr.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/fsck/xattr.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/android_config.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/include/android_config.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/android_config.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/include/android_config.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/f2fs_fs.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/include/f2fs_fs.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/f2fs_fs.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/include/f2fs_fs.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/quota.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/include/quota.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/include/quota.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/include/quota.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs_io.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs_io.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs_io.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs_io.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs_zoned.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs_zoned.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/libf2fs_zoned.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/libf2fs_zoned.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/nls_utf8.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/nls_utf8.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/nls_utf8.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/nls_utf8.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/utf8data.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/lib/utf8data.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/lib/utf8data.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/lib/utf8data.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/m4/.gitignore b/base/cvd/vendor_src/+git_repository+f2fs_tools/m4/.gitignore similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/m4/.gitignore rename to base/cvd/vendor_src/+git_repository+f2fs_tools/m4/.gitignore diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/defrag.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/defrag.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/defrag.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/defrag.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/dump.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/dump.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/dump.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/dump.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/f2fs_io.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/f2fs_io.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/f2fs_io.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/f2fs_io.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/f2fslabel.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/f2fslabel.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/f2fslabel.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/f2fslabel.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/fsck.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/fsck.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/fsck.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/fsck.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/inject.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/inject.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/inject.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/inject.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/mkfs.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/mkfs.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/mkfs.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/mkfs.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/resize.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/resize.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/resize.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/resize.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/sload.f2fs.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/man/sload.f2fs.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/man/sload.f2fs.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/man/sload.f2fs.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_main.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_main.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_main.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_main.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_utils.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_utils.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_utils.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_utils.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_utils.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_utils.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/mkfs/f2fs_format_utils.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/mkfs/f2fs_format_utils.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/dumpf2fs.sh b/base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/dumpf2fs.sh similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/dumpf2fs.sh rename to base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/dumpf2fs.sh diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/spo_test.sh b/base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/spo_test.sh similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/spo_test.sh rename to base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/spo_test.sh diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/tracepoint.sh b/base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/tracepoint.sh similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/tracepoint.sh rename to base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/tracepoint.sh diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/verify.sh b/base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/verify.sh similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/scripts/verify.sh rename to base/cvd/vendor_src/+git_repository+f2fs_tools/scripts/verify.sh diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/Android.bp b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/Android.bp similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/Android.bp rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/Android.bp diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/Makefile.am b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/Makefile.am similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/Makefile.am rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/Makefile.am diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/f2fs_io.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/f2fs_io.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/f2fs_io.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/f2fs_io.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/f2fs_io.h b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/f2fs_io.h similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io/f2fs_io.h rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io/f2fs_io.h diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io_parse.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io_parse.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fs_io_parse.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fs_io_parse.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fscrypt.8 b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fscrypt.8 similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fscrypt.8 rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fscrypt.8 diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fscrypt.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fscrypt.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/f2fscrypt.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/f2fscrypt.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/fibmap.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/fibmap.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/fibmap.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/fibmap.c diff --git a/base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/sha512.c b/base/cvd/vendor_src/+git_repository+f2fs_tools/tools/sha512.c similarity index 100% rename from base/cvd/vendor_src/+_repo_rules3+f2fs_tools/tools/sha512.c rename to base/cvd/vendor_src/+git_repository+f2fs_tools/tools/sha512.c diff --git a/base/cvd/vendor_src/@+_repo_rules3+f2fs_tools.marker b/base/cvd/vendor_src/@+_repo_rules3+f2fs_tools.marker deleted file mode 100644 index fa8b56426fc..00000000000 --- a/base/cvd/vendor_src/@+_repo_rules3+f2fs_tools.marker +++ /dev/null @@ -1,2 +0,0 @@ -656ca3e01bf6dd098b60cfe275fb5709011ee7bf088b960b32cae0ed42483a41 -FILE:@@//BUILD.f2fs_tools.bazel afe8b5dd91820958eb1fef87b26d1124d89bb58693971c98f5f1c269059e8eae diff --git a/base/cvd/vendor_src/@+git_repository+f2fs_tools.marker b/base/cvd/vendor_src/@+git_repository+f2fs_tools.marker new file mode 100644 index 00000000000..6fb9acd1bc0 --- /dev/null +++ b/base/cvd/vendor_src/@+git_repository+f2fs_tools.marker @@ -0,0 +1,2 @@ +fd9da90ed163ee12695caecfa192ba0c6d2affc1450b32e036a4e62f296280c5 +FILE:@@//BUILD.f2fs_tools.bazel fb918d19f3fda45ffd6783bd4583d585067703b92e02c6dc288eaf4a01ea9d5f diff --git a/e2etests/MODULE.bazel b/e2etests/MODULE.bazel index 9f08161fed2..324c1632be4 100644 --- a/e2etests/MODULE.bazel +++ b/e2etests/MODULE.bazel @@ -1,5 +1,6 @@ bazel_dep(name = "gazelle", version = "0.40.0") -bazel_dep(name = "rules_go", version = "0.50.1") +bazel_dep(name = "rules_go", version = "0.59.0") +bazel_dep(name = "rules_shell", version = "0.6.1") go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") go_sdk.download(version = "1.23.1") diff --git a/e2etests/cvd/boot_tests.bzl b/e2etests/cvd/boot_tests.bzl index aa7264a6bbe..3c5a8ed99a1 100644 --- a/e2etests/cvd/boot_tests.bzl +++ b/e2etests/cvd/boot_tests.bzl @@ -1,8 +1,10 @@ +load("@rules_shell//shell:sh_test.bzl", "sh_test") + def launch_cvd_boot_test(name, branch, target, credential_source = ""): args = ["-b", branch, "-t", target] if credential_source: args += ["-c", credential_source] - native.sh_test( + sh_test( name = name, size = "medium", srcs = ["launch_cvd_boot_test.sh"], @@ -18,7 +20,7 @@ def cvd_load_boot_test(name, env_file, size = "medium", credential_source = ""): args = ["-e", "cvd/" + env_file] if credential_source: args += ["-c", credential_source] - native.sh_test( + sh_test( name = name, size = size, srcs = ["cvd_load_boot_test.sh"], @@ -38,7 +40,7 @@ def cvd_command_boot_test(name, branch, target, cvd_command = [], credential_sou if substitutions: args += ["-s", ",".join(substitutions)] args += cvd_command - native.sh_test( + sh_test( name = name, size = "medium", srcs = ["cvd_command_boot_test.sh"], diff --git a/e2etests/orchestration/artifacts/BUILD.bazel b/e2etests/orchestration/artifacts/BUILD.bazel index c3302616bde..59fa09d097c 100644 --- a/e2etests/orchestration/artifacts/BUILD.bazel +++ b/e2etests/orchestration/artifacts/BUILD.bazel @@ -13,6 +13,7 @@ # limitations under the License. load("def.bzl", "aosp_artifact") +load("@rules_shell//shell:sh_binary.bzl", "sh_binary") sh_binary( name = "fetch_aosp_artifact",