diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2019-01-09 10:29:22 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-01-09 10:29:22 -0800 |
| commit | 19914dd942b39e048be55f096ad7267e2be7bb20 (patch) | |
| tree | dd3257a2e462e5b2cbb8428ed280eef83855e830 | |
| parent | 3a59faf632427f26bc8dceed46c1fe748fd7df3c (diff) | |
| parent | 25e13ac79b67383765c0b786c7647af97676539a (diff) | |
Merge pull request #17590 from graknlabs/fix-bazel-incompatibilities
Fix incompatible_bzl_disallow_load_after_statement, deprecated attribute usage
| -rw-r--r-- | bazel/cc_grpc_library.bzl | 2 | ||||
| -rw-r--r-- | bazel/generate_cc.bzl | 2 | ||||
| -rw-r--r-- | bazel/grpc_build_system.bzl | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl index 3288565714..6bfcd653f5 100644 --- a/bazel/cc_grpc_library.bzl +++ b/bazel/cc_grpc_library.bzl @@ -1,6 +1,6 @@ """Generates and compiles C++ grpc stubs from proto_library rules.""" -load("//:bazel/generate_cc.bzl", "generate_cc") +load("//bazel:generate_cc.bzl", "generate_cc") def cc_grpc_library(name, srcs, deps, proto_only, well_known_protos, generate_mocks = False, use_external = False, **kwargs): """Generates C++ grpc classes from a .proto file. diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl index ae747aa42c..2f14071f92 100644 --- a/bazel/generate_cc.bzl +++ b/bazel/generate_cc.bzl @@ -83,7 +83,7 @@ _generate_cc = rule( attrs = { "srcs": attr.label_list( mandatory = True, - non_empty = True, + allow_empty = False, providers = ["proto"], ), "plugin": attr.label( diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 65fe5a10aa..caeafc76b6 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -23,6 +23,8 @@ # each change must be ported from one to the other. # +load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") + # The set of pollers to test against if a test exercises polling POLLERS = ["epollex", "epoll1", "poll", "poll-cv"] @@ -111,7 +113,6 @@ def grpc_proto_plugin(name, srcs = [], deps = []): deps = deps, ) -load("//:bazel/cc_grpc_library.bzl", "cc_grpc_library") def grpc_proto_library( name, |