Skip to content

Commit 0c690e5

Browse files
committed
Merge branch 'master' of github.com:rules-proto-grpc/rules_proto_grpc
2 parents 500cccc + a7b284e commit 0c690e5

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

modules/buf/buf.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ set -uo pipefail
6868
".",
6969
short_paths = True,
7070
extra_options = options,
71-
resolve_tools = False,
7271
)
7372
all_inputs += cmd_inputs
7473

modules/core/internal/protoc.bzl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def build_protoc_args(
1414
extra_options = [],
1515
extra_protoc_args = [],
1616
short_paths = False,
17-
resolve_tools = True):
17+
resolve_tools = None):
1818
"""
1919
Build the args for a protoc invocation.
2020
@@ -38,18 +38,16 @@ def build_protoc_args(
3838
3939
"""
4040

41+
if resolve_tools != None:
42+
print("WARNING: build_protoc_args: Ignored legacy resolve_tools argument set to {}".format(resolve_tools))
43+
4144
# Specify path getter
4245
get_path = _short_path if short_paths else _path
4346

4447
# Build inputs and manifests list
4548
inputs = []
4649
input_manifests = []
4750

48-
if plugin.tool and resolve_tools:
49-
plugin_runfiles, plugin_input_manifests = ctx.resolve_tools(tools = [plugin.tool])
50-
inputs += plugin_runfiles.to_list()
51-
input_manifests += plugin_input_manifests
52-
5351
inputs += plugin.data
5452

5553
# Get plugin name

0 commit comments

Comments
 (0)