Automated rollback of commit d870630ee7c8ec319ce22f90b33b718eeb8503eb.
*** Reason for rollback ***
Broke the nightly, b/152491709
*** Original change description ***
Slight refactoring to PyCommon
This makes it easier for a Google-internal ruleset to add a PyInfo provider.
RELNOTES: None
PiperOrigin-RevId: 303116822
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
index 3c8968f..69cf9ff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
@@ -895,13 +895,10 @@
return ruleContext.getRelatedArtifact(executable.getRootRelativePath(), "");
}
- /**
- * Adds a PyInfo or legacy "py" provider.
- *
- * <p>This is a public method because some rules just want a PyInfo provider without the other
- * things py_library needs.
- */
- public void addPyInfoProvider(RuleConfiguredTargetBuilder builder) {
+ public void addCommonTransitiveInfoProviders(
+ RuleConfiguredTargetBuilder builder, NestedSet<Artifact> filesToBuild) {
+
+ // Add PyInfo and/or legacy "py" struct provider.
boolean createLegacyPyProvider =
!ruleContext.getFragment(PythonConfiguration.class).disallowLegacyPyProvider();
PyProviderUtils.builder(createLegacyPyProvider)
@@ -911,11 +908,6 @@
.setHasPy2OnlySources(hasPy2OnlySources)
.setHasPy3OnlySources(hasPy3OnlySources)
.buildAndAddToTarget(builder);
- }
-
- public void addCommonTransitiveInfoProviders(
- RuleConfiguredTargetBuilder builder, NestedSet<Artifact> filesToBuild) {
- addPyInfoProvider(builder);
// Add PyRuntimeInfo if this is an executable rule.
if (runtimeFromToolchain != null) {
