natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19097 from keith/ks/bazel-incompat 

Fix bazel incompatible changes
This commit is contained in:
Richard Belleville 2019-05-29 09:39:57 -07:00 committed by GitHub
parent b4972edc3f f131adf89c
commit 461d1bf9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bazel/generate_cc.bzl
View File

@ -41,11 +41,11 @@ def _join_directories(directories):
def generate_cc_impl(ctx):
"""Implementation of the generate_cc rule."""
protos = [f for src in ctx.attr.srcs for f in src.proto.check_deps_sources]
protos = [f for src in ctx.attr.srcs for f in src.proto.check_deps_sources.to_list()]
includes = [
f
for src in ctx.attr.srcs
for f in src.proto.transitive_imports
for f in src.proto.transitive_imports.to_list()
]
outs = []
proto_root = get_proto_root(
@ -128,7 +128,7 @@ def generate_cc_impl(ctx):
arguments += ["-I{0}".format(f + "/../..")]
well_known_proto_files = [
f
for f in ctx.attr.well_known_protos.files
for f in ctx.attr.well_known_protos.files.to_list()
]
ctx.actions.run(

2
bazel/python_rules.bzl
View File

@ -33,7 +33,7 @@ def _generate_py_impl(context):
includes = [
file
for src in context.attr.deps
for file in src.proto.transitive_imports
for file in src.proto.transitive_imports.to_list()
]
proto_root = get_proto_root(context.label.workspace_root)
format_str = (_GENERATED_GRPC_PROTO_FORMAT if context.executable.plugin else _GENERATED_PROTO_FORMAT)