Remove the unused protoInfos argument of ProtobufSupport.
RELNOTES: None.
PiperOrigin-RevId: 257437870
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
index 0f2b702..c8a5786 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
@@ -37,7 +37,6 @@
import com.google.devtools.build.lib.rules.cpp.CcInfo;
import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key;
-import com.google.devtools.build.lib.rules.proto.ProtoInfo;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
import java.util.List;
import java.util.Map;
@@ -123,7 +122,6 @@
ruleContext,
childToolchainConfig,
protosToAvoid,
- ImmutableList.<ProtoInfo>of(),
objcProtoProviders,
ProtobufSupport.getTransitivePortableProtoFilters(objcProtoProviders),
childToolchain)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
index 2c2d154..c612f8c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
@@ -39,7 +39,6 @@
import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs;
-import com.google.devtools.build.lib.rules.proto.ProtoInfo;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
import java.util.List;
import java.util.Map;
@@ -234,7 +233,6 @@
ruleContext,
childToolchainConfig,
protosToAvoid,
- ImmutableList.<ProtoInfo>of(),
depProtoProviders,
ProtobufSupport.getTransitivePortableProtoFilters(depProtoProviders),
childConfigurationsAndToolchains.get(childToolchainConfig))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
index e67540c..0ba6430 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
@@ -99,38 +99,9 @@
* @param ruleContext context this proto library is constructed in
* @param buildConfiguration the configuration from which to get prerequisites when building proto
* targets in a split configuration
- * @param protoInfos the list of ProtoInfos that this proto support should process
- * @param objcProtoProviders the list of ObjcProtoProviders that this proto support should process
- */
- public ProtobufSupport(
- RuleContext ruleContext,
- BuildConfiguration buildConfiguration,
- Iterable<ProtoInfo> protoInfos,
- Iterable<ObjcProtoProvider> objcProtoProviders,
- NestedSet<Artifact> portableProtoFilters) {
- this(
- ruleContext,
- buildConfiguration,
- NestedSetBuilder.<Artifact>stableOrder().build(),
- protoInfos,
- objcProtoProviders,
- portableProtoFilters,
- null);
- }
-
- /**
- * Creates a new proto support for the protobuf library. This support code bundles up all the
- * transitive protos within the groups in which they were defined. We use that information to
- * minimize the number of inputs per generation/compilation actions by only providing what is
- * really needed to the actions.
- *
- * @param ruleContext context this proto library is constructed in
- * @param buildConfiguration the configuration from which to get prerequisites when building proto
- * targets in a split configuration
* @param dylibHandledProtos a set of protos linked into dynamic libraries that the current rule
* depends on; these protos will not be output by this support, thus avoiding duplicate
* symbols
- * @param protoInfos the list of ProtoInfos that this proto support should process
* @param objcProtoProviders the list of ObjcProtoProviders that this proto support should process
* @param toolchain if not null, the toolchain to override the default toolchain for the rule
* context.
@@ -139,7 +110,6 @@
RuleContext ruleContext,
BuildConfiguration buildConfiguration,
NestedSet<Artifact> dylibHandledProtos,
- Iterable<ProtoInfo> protoInfos,
Iterable<ObjcProtoProvider> objcProtoProviders,
NestedSet<Artifact> portableProtoFilters,
CcToolchainProvider toolchain) {
@@ -149,7 +119,7 @@
this.dylibHandledProtoPaths = runfilesPaths(dylibHandledProtos.toSet());
this.objcProtoProviders = objcProtoProviders;
this.portableProtoFilters = portableProtoFilters;
- this.inputsToOutputsMap = getInputsToOutputsMap(attributes, protoInfos, objcProtoProviders);
+ this.inputsToOutputsMap = getInputsToOutputsMap(attributes, objcProtoProviders);
this.toolchain = toolchain;
}
@@ -271,9 +241,7 @@
}
private static ImmutableSetMultimap<ImmutableSet<Artifact>, Artifact> getInputsToOutputsMap(
- ProtoAttributes attributes,
- Iterable<ProtoInfo> protoInfos,
- Iterable<ObjcProtoProvider> objcProtoProviders) {
+ ProtoAttributes attributes, Iterable<ObjcProtoProvider> objcProtoProviders) {
ImmutableList.Builder<NestedSet<Artifact>> protoSets =
new ImmutableList.Builder<NestedSet<Artifact>>();
@@ -282,9 +250,6 @@
for (ObjcProtoProvider objcProtoProvider : objcProtoProviders) {
protoSets.addAll(objcProtoProvider.getProtoGroups());
}
- for (ProtoInfo protoInfo : protoInfos) {
- protoSets.add(protoInfo.getTransitiveProtoSources());
- }
HashMap<Artifact, Set<Artifact>> protoToGroupMap = new HashMap<>();
