Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
9.0.0rc3
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Wey <w2284938880@gmail.com>
LinXunFeng <linxunfeng@yeah.net>
Xiaohan Wang <wxh158849067@gmail.com>
Faijur Rahman <faijur.rahman@imagination.corp-partner.google.com>
Theo Paris <theo@theoparis.com>

# Trusted service accounts.
GitHub Dependabot <(\d+)\+dependabot\[bot\]@users.noreply.github.com>
Expand Down
19 changes: 3 additions & 16 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module(
)

# Bazel and Toolchain deps
EMSDK_VERSION = "4.0.7"
EMSDK_VERSION = "4.0.17"

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "buildifier_prebuilt", version = "8.0.3")
Expand All @@ -15,7 +15,7 @@ bazel_dep(name = "rules_python", version = "1.3.0")
bazel_dep(name = "rules_rust", version = "0.60.0")
bazel_dep(name = "rules_shell", version = "0.4.1")

bazel_dep(name = "rules_webtesting", version = "0.4.0", dev_dependency = True)
bazel_dep(name = "rules_webtesting", version = "0.4.1", dev_dependency = True)
bazel_dep(name = "emsdk", version = EMSDK_VERSION, dev_dependency = True)
bazel_dep(name = "rules_go", version = "0.54.0", dev_dependency = True)

Expand Down Expand Up @@ -212,20 +212,7 @@ use_repo(
"cargo_bindeps",
)

# TODO(kjlubick): Switch to a release version once it's available in BCR.
# We should be able to clean up rules_scala also
git_override(
module_name = "rules_webtesting",
commit = "c884a863c09001776b001a76886e14f87ca8fd12",
remote = "https://github.com/bazelbuild/rules_webtesting.git",
)

bazel_dep(name = "rules_scala", dev_dependency = True, repo_name = "io_bazel_rules_scala")
git_override(
module_name = "rules_scala",
commit = "219e63983e8e483e66ebf70372969ba227382001",
remote = "https://github.com/mbland/rules_scala",
)
bazel_dep(name = "rules_scala", dev_dependency = True, version = "7.1.5", repo_name = "io_bazel_rules_scala")

scala_deps = use_extension(
"@io_bazel_rules_scala//scala/extensions:deps.bzl",
Expand Down
8,370 changes: 201 additions & 8,169 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions bazel/external/gn/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# gn format gn/sksl.gni
# except it uses a hermetic version of gn instead of whatever is on the user's machine. Note the --
# to pass arguments to gn and not have Bazel try to understand them.
load("@rules_python//python:defs.bzl", "py_binary")

py_binary(
name = "gn",
srcs = [":gn.py"],
Expand Down
1 change: 1 addition & 0 deletions bazel/external/icu/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# rule in WORKSPACE.bazel, so all files should be relative to that path.

load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_python//python:defs.bzl", "py_binary")

# We define this here because the emscripten toolchain calls the cpu wasm, whereas the
# bazelbuild/platforms call it wasm32. https://github.com/emscripten-core/emsdk/issues/919
Expand Down
2 changes: 1 addition & 1 deletion bazel/platform/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ platform(
":cgo_off", # Necessary to build locally (i.e. non-RBE builds).
":use_hermetic_toolchain",
],
parents = ["@local_config_platform//:host"],
parents = ["@platforms//host"],
)

platform(
Expand Down
2 changes: 1 addition & 1 deletion bazel/rbe/gce_linux/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

load(":cc_toolchain_config.bzl", "cc_toolchain_config")
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite", "cc_library")

package(default_visibility = ["//visibility:public"])

Expand Down
1 change: 1 addition & 0 deletions bazel/rbe/gce_linux/cc/armeabi_cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ load(
"feature",
"tool_path",
)
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")

def _impl(ctx):
toolchain_identifier = "stub_armeabi-v7a"
Expand Down
1 change: 1 addition & 0 deletions bazel/rbe/gce_linux/cc/cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")

def layering_check_features(compiler):
if compiler != "clang":
Expand Down
2 changes: 1 addition & 1 deletion bazel/rbe/gce_linux/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ toolchain(

platform(
name = "platform",
parents = ["@local_config_platform//:host"],
parents = ["@platforms//host"],
constraint_values = [
"@bazel_tools//tools/cpp:clang",
"@platforms//cpu:x86_64",
Expand Down
2 changes: 2 additions & 0 deletions gn/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_python//python:defs.bzl", "py_binary")

package(
default_applicable_licenses = ["//:license"],
)
Expand Down
1 change: 1 addition & 0 deletions toolchain/ios_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ load(
"variable_with_value",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
load(":clang_layering_check.bzl", "make_layering_check_features")

# The location of the created clang toolchain.
Expand Down
1 change: 1 addition & 0 deletions toolchain/linux_amd64_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ load(
"variable_with_value",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
load(":clang_layering_check.bzl", "make_layering_check_features")

# The location of the created clang toolchain.
Expand Down
1 change: 1 addition & 0 deletions toolchain/mac_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ load(
"variable_with_value",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
load(":clang_layering_check.bzl", "make_layering_check_features")

# The location of the created clang toolchain.
Expand Down
1 change: 1 addition & 0 deletions toolchain/ndk_linux_arm64_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ load(
"with_feature_set",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
load(":download_ndk_linux_amd64_toolchain.bzl", "NDK_PATH")

# Supported CPUs.
Expand Down
1 change: 1 addition & 0 deletions toolchain/windows_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ load(
"variable_with_value",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")

# TODO(borenet): These variables were copied from the automatically-generated
# @clang_windows_amd64//:vars.bzl file. They are available to be directly
Expand Down
2 changes: 1 addition & 1 deletion tools/testrunners/common/android/adb_test.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""This module defines the adb_test rule."""

load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")
load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS")
load("//bazel:remove_indentation.bzl", "remove_indentation")

def _adb_test_runner_transition_impl(settings, attr): # buildifier: disable=unused-variable
Expand Down