Skip to content

Commit

Permalink
Merge #271.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 705666450
Change-Id: I8cb64dad9b084fc82445295749c484751fa48f4f
  • Loading branch information
fhanau authored and copybara-github committed Dec 13, 2024
1 parent 96771f5 commit 044214e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 20 deletions.
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ module(

bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
bazel_dep(name = "google_benchmark", version = "1.8.3", repo_name = "com_github_google_benchmark")
bazel_dep(name = "googletest", version = "1.13.0", repo_name = "com_google_googletest")
bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "27.5", repo_name = "com_google_protobuf")
bazel_dep(name = "re2", version = "2024-02-01", repo_name = "com_googlesource_code_re2")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_fuzzing", version = "0.5.1")
bazel_dep(name = "rules_proto", version = "4.0.0")
bazel_dep(name = "rules_fuzzing", version = "0.5.2")
7 changes: 4 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,16 @@ http_archive(
# Proto rules for Bazel and Protobuf
http_archive(
name = "com_google_protobuf",
sha256 = "9ca59193fcfe52c54e4c2b4584770acd1a6528fc35efad363f8513c224490c50",
strip_prefix = "protobuf-13d559beb6967033a467a7517c35d8ad970f8afb",
urls = ["https://github.com/protocolbuffers/protobuf/archive/13d559beb6967033a467a7517c35d8ad970f8afb.zip"],
integrity = "sha256-ecxtCdAnBsWnPpAOqEK1s9rhYPNxtmVHdJR/54GFFCM=",
strip_prefix = "protobuf-27.5",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v27.5.tar.gz"],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

# rules_proto is deprecated, but still needed by fuzztest.
http_archive(
name = "rules_proto",
sha256 = "66bfdf8782796239d3875d37e7de19b1d94301e8972b3cbd2446b332429b4df1",
Expand Down
16 changes: 5 additions & 11 deletions WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# See MODULE.bazel for external dependencies setup.

# Having both WORKSPACE and MODULE.bazel specify dependencies is brittle.
# fuzztest is not yet available via Bazel registry, but should be soon:
# https://github.com/bazelbuild/bazel-central-registry/issues/1391
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "com_google_fuzztest",
strip_prefix = "fuzztest-7e084905bce6ffa97b58cf8e8945e5cea2348a5a",
url = "https://github.com/google/fuzztest/archive/7e084905bce6ffa97b58cf8e8945e5cea2348a5a.zip",
)
# https://bazel.build/external/migration#workspace.bzlmod
#
# This file is intentionally empty. When bzlmod is enabled and this
# file exists, the content of WORKSPACE is ignored. This prevents
# bzlmod builds from unintentionally depending on the WORKSPACE file.
1 change: 0 additions & 1 deletion tcmalloc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ tcmalloc_deps = [
"@com_google_absl//absl/base:config",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/base:dynamic_annotations",
"@com_google_absl//absl/debugging:leak_check",
"@com_google_absl//absl/debugging:stacktrace",
"@com_google_absl//absl/debugging:symbolize",
"//tcmalloc/selsan",
Expand Down
4 changes: 2 additions & 2 deletions tcmalloc/internal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#
# Internal libraries used for the implementation and testing of TCMalloc.

load("@rules_cc//cc:defs.bzl", "cc_proto_library")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//tcmalloc:copts.bzl", "TCMALLOC_DEFAULT_COPTS")
load("//tcmalloc:variants.bzl", "create_tcmalloc_benchmark")

Expand Down

0 comments on commit 044214e

Please sign in to comment.