|
@@ -3,7 +3,6 @@
|
|
|
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
|
|
|
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test", "objc_library", native_cc_proto_library = "cc_proto_library")
|
|
|
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
|
|
|
-load("@rules_proto//proto/private:native.bzl", "native_proto_common")
|
|
|
load("@rules_python//python:defs.bzl", "py_library")
|
|
|
load(":cc_proto_blacklist_test.bzl", "cc_proto_blacklist_test")
|
|
|
|
|
@@ -945,13 +944,9 @@ cc_library(
|
|
|
],
|
|
|
)
|
|
|
|
|
|
-# Note: We use `native_proto_common` here because we depend on an implementation-detail of
|
|
|
-# `proto_lang_toolchain`, which may not be available on `proto_common`.
|
|
|
-reject_blacklisted_files = hasattr(native_proto_common, "proto_lang_toolchain_rejects_files_do_not_use_or_we_will_break_you_without_mercy")
|
|
|
-cc_toolchain_blacklisted_protos = [proto + "_proto" for proto in WELL_KNOWN_PROTO_MAP.keys()] if reject_blacklisted_files else [":well_known_protos"]
|
|
|
proto_lang_toolchain(
|
|
|
name = "cc_toolchain",
|
|
|
- blacklisted_protos = cc_toolchain_blacklisted_protos,
|
|
|
+ blacklisted_protos = [proto + "_proto" for proto in WELL_KNOWN_PROTO_MAP.keys()],
|
|
|
command_line = "--cpp_out=$(OUT)",
|
|
|
runtime = ":protobuf",
|
|
|
visibility = ["//visibility:public"],
|