Remove deprecated args from create_proto_compile_action
PiperOrigin-RevId: 433476983
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index 89736ae..4d9c8f0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -65,7 +65,6 @@
private boolean hasServices;
private Iterable<String> additionalCommandLineArguments;
private Iterable<FilesToRunProvider> additionalTools;
- private boolean checkStrictImportPublic;
private String mnemonic;
public ProtoCompileActionBuilder allowServices(boolean hasServices) {
@@ -109,11 +108,6 @@
return this;
}
- public ProtoCompileActionBuilder checkStrictImportPublic(boolean checkStrictImportPublic) {
- this.checkStrictImportPublic = checkStrictImportPublic;
- return this;
- }
-
public ProtoCompileActionBuilder(
ProtoInfo protoInfo,
FilesToRunProvider protoCompiler,
@@ -216,7 +210,6 @@
/* additional_args */ additionalArgs,
/* plugins */ StarlarkList.immutableCopyOf(plugins.build()),
/* mnemonic */ mnemonic,
- /* strict_imports */ checkStrictImportPublic,
/* additional_inputs */ inputs == null
? Depset.of(ElementType.EMPTY, NestedSetBuilder.emptySet(Order.STABLE_ORDER))
: Depset.of(Artifact.TYPE, NestedSetBuilder.wrap(Order.STABLE_ORDER, inputs)),
diff --git a/src/main/starlark/builtins_bzl/common/proto/proto_common.bzl b/src/main/starlark/builtins_bzl/common/proto/proto_common.bzl
index be4513e..49bfb91 100644
--- a/src/main/starlark/builtins_bzl/common/proto/proto_common.bzl
+++ b/src/main/starlark/builtins_bzl/common/proto/proto_common.bzl
@@ -22,10 +22,9 @@
proto_compiler,
progress_message,
outputs,
- additional_args = [],
+ additional_args = None,
plugins = [],
mnemonic = "GenProto",
- strict_imports = False,
additional_inputs = depset(),
resource_set = None):
"""Creates proto compile action for compiling *.proto files to language specific sources.
@@ -40,12 +39,8 @@
outputs: The output files generated by the proto compiler.
additional_args: Additional arguments to add to the action.
Accepts an ctx.actions.args() object that is added at the beginning of command line.
- Deprecated: Accepts a list containing: a string, a pair of value and
- format string, or a pair of list of strings and a format string.
plugins: Additional plugin executables used by proto compiler.
mnemonic: The mnemonic to set on the action.
- strict_imports:
- Deprecated: Whether to check for strict imports.
additional_inputs: Additional inputs to add to the action.
resource_set: A callback function that is passed to the created action.
See `ctx.actions.run`, `resource_set` parameter.
@@ -58,16 +53,6 @@
args.add_all(proto_info.transitive_proto_path, map_each = _proto_path_flag)
# Example: `--proto_path=--proto_path=bazel-bin/target/third_party/pkg/_virtual_imports/subpkg`
- if type(additional_args) == type([]):
- for arg in additional_args:
- if type(arg) == type((None, None)):
- if type(arg[0]) == type([]):
- args.add_joined(arg[0], join_with = "", format_joined = arg[1])
- else:
- args.add(arg[0], format = arg[1])
- else:
- args.add(arg)
-
args.add_all(ctx.fragments.proto.experimental_protoc_opts)
# Include maps
@@ -79,7 +64,7 @@
args.add_all(proto_info.direct_sources)
- if type(additional_args) == type(ctx.actions.args()):
+ if additional_args:
additional_args.use_param_file(param_file_arg = "@%s")
additional_args.set_param_file_format("multiline")
@@ -87,7 +72,7 @@
mnemonic = mnemonic,
progress_message = progress_message,
executable = proto_compiler,
- arguments = [additional_args, args] if type(additional_args) == type(ctx.actions.args()) else [args],
+ arguments = [additional_args, args] if additional_args else [args],
inputs = depset(transitive = [proto_info.transitive_sources, additional_inputs]),
outputs = outputs,
tools = plugins,
