From 51000fe6f9c65853a230660445775f048e194478 Mon Sep 17 00:00:00 2001 From: Yannic Date: Thu, 9 Jan 2020 15:03:01 +0100 Subject: [PATCH] Update BUILD --- BUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 5a1526e9bd01..e678db70151a 100644 --- a/BUILD +++ b/BUILD @@ -2,7 +2,8 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test", "objc_library") load("@rules_java//java:defs.bzl", "java_library") -load("@rules_proto//proto:defs.bzl", "proto_common", "proto_lang_toolchain", "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") licenses(["notice"]) @@ -986,7 +987,9 @@ cc_library( ], ) -reject_blacklisted_files = not hasattr(proto_common, "proto_lang_toolchain_rejects_files_do_not_use_or_we_will_break_you_without_mercy") +# 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 = not 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",