Clean up after rolling out --correctRollupTransitiveProtoRuntimes.
RELNOTES: None
PiperOrigin-RevId: 166735889
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
index 3972163..1b634cb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
@@ -27,7 +27,6 @@
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap;
import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMapBuilder;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -39,7 +38,6 @@
import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
import com.google.devtools.build.lib.rules.java.ProtoJavaApiInfoProvider;
-import com.google.devtools.build.lib.rules.proto.ProtoConfiguration;
public class ActionReuser {
@@ -61,26 +59,11 @@
return false;
}
- boolean correctRollupTransitiveProtoRuntimes =
- ruleContext
- .getConfiguration()
- .getFragment(ProtoConfiguration.class)
- .correctRollupTransitiveProtoRuntimes();
-
JavaCompilationArgs.Builder transitiveJars =
JavaCompilationArgs.builder()
.addTransitiveArgs(javaApi.getTransitiveJavaCompilationArgsImmutable(), BOTH)
+ .addTransitiveArgs(javaApi.getTransitiveProtoRuntimeImmutable(), BOTH)
.merge(directJars);
- if (correctRollupTransitiveProtoRuntimes) {
- transitiveJars.addTransitiveArgs(javaApi.getTransitiveProtoRuntimeImmutable(), BOTH);
- } else {
- for (TransitiveInfoCollection t : javaApi.getProtoRuntimeImmutable()) {
- JavaCompilationArgsProvider p = t.getProvider(JavaCompilationArgsProvider.class);
- if (p != null) {
- transitiveJars.addTransitiveArgs(p.getRecursiveJavaCompilationArgs(), BOTH);
- }
- }
- }
Artifact outputJar = getOnlyElement(directJars.getRuntimeJars());
Artifact compileTimeJar = getOnlyElement(directJars.getCompileTimeJars());
@@ -92,7 +75,7 @@
transitiveJars.build(),
NestedSetBuilder.create(
Order.STABLE_ORDER, directJars.getCompileTimeDependencyArtifact()),
- NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
+ NestedSetBuilder.emptySet(Order.STABLE_ORDER));
TransitiveInfoProviderMapBuilder javaProvidersBuilder =
new TransitiveInfoProviderMapBuilder()
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
index d36504b..36c1e96 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
@@ -154,16 +154,16 @@
)
public List<String> ccProtoLibrarySourceSuffixes;
+ // TODO(b/64032754): Remove once there's no 'correctRollupTransitiveProtoRuntimes' in the global
+ // blazerc.
@Option(
name = "correctRollupTransitiveProtoRuntimes",
- defaultValue = "false",
+ defaultValue = "true",
category = "rollout",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
- help =
- "Roll-out flag for changing behavior of proto runtime roll up. "
- + "See commit description for details. DO NOT USE."
+ help = "ignored"
)
public boolean correctRollupTransitiveProtoRuntimes;
@@ -193,7 +193,6 @@
host.strictProtoDeps = strictProtoDeps;
host.ccProtoLibraryHeaderSuffixes = ccProtoLibraryHeaderSuffixes;
host.ccProtoLibrarySourceSuffixes = ccProtoLibrarySourceSuffixes;
- host.correctRollupTransitiveProtoRuntimes = correctRollupTransitiveProtoRuntimes;
host.jplNonStrictDepsLikePl = jplNonStrictDepsLikePl;
return host;
}
@@ -273,10 +272,6 @@
return ccProtoLibrarySourceSuffixes;
}
- public boolean correctRollupTransitiveProtoRuntimes() {
- return options.correctRollupTransitiveProtoRuntimes;
- }
-
public boolean jplNonStrictDepsLikePl() {
return options.jplNonStrictDepsLikePl;
}
