aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/python
diff options
context:
space:
mode:
authorGravatar dslomov <dslomov@google.com>2017-08-21 12:52:41 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-08-21 14:16:34 +0200
commit375f95b16e1a8b164d2caaa4d65a4c9b4e310bd3 (patch)
treefaf5464b37651fa52f76d63f060e6dd2b09dd522 /src/main/java/com/google/devtools/build/lib/rules/python
parente3684497a5a8c4bd42ff970b37c49dc70bcc3eae (diff)
Rename some of native declared providers according to the new naming scheme.
RELNOTES: None PiperOrigin-RevId: 165910455
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/python')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java6
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java
index 9f809dd1ef..9ca8d90b34 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java
@@ -26,7 +26,7 @@ import com.google.devtools.build.lib.analysis.RunfilesSupport;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.rules.cpp.CcCommon.CcFlagsSupplier;
import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
-import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
+import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo;
import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.ArrayList;
@@ -118,7 +118,7 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory {
.setFilesToBuild(common.getFilesToBuild())
.add(RunfilesProvider.class, runfilesProvider)
.setRunfilesSupport(runfilesSupport, realExecutable)
- .addNativeDeclaredProvider(new CcLinkParamsProvider(ccLinkParamsStore))
+ .addNativeDeclaredProvider(new CcLinkParamsInfo(ccLinkParamsStore))
.add(PythonImportsProvider.class, new PythonImportsProvider(imports));
}
@@ -146,7 +146,7 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory {
boolean linkShared) {
builder.addTransitiveTargets(ruleContext.getPrerequisites("deps", Mode.TARGET),
PyCcLinkParamsProvider.TO_LINK_PARAMS,
- CcLinkParamsProvider.TO_LINK_PARAMS);
+ CcLinkParamsInfo.TO_LINK_PARAMS);
}
};
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java
index 762af4fc4a..20399cf8ae 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java
@@ -25,7 +25,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
-import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
+import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo;
import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.ArrayList;
@@ -67,7 +67,7 @@ public abstract class PyLibrary implements RuleConfiguredTargetFactory {
boolean linkShared) {
builder.addTransitiveTargets(ruleContext.getPrerequisites("deps", Mode.TARGET),
PyCcLinkParamsProvider.TO_LINK_PARAMS,
- CcLinkParamsProvider.TO_LINK_PARAMS);
+ CcLinkParamsInfo.TO_LINK_PARAMS);
}
};
@@ -92,7 +92,7 @@ public abstract class PyLibrary implements RuleConfiguredTargetFactory {
return builder
.setFilesToBuild(filesToBuild)
.add(RunfilesProvider.class, RunfilesProvider.simple(runfilesBuilder.build()))
- .addNativeDeclaredProvider(new CcLinkParamsProvider(ccLinkParamsStore))
+ .addNativeDeclaredProvider(new CcLinkParamsInfo(ccLinkParamsStore))
.add(PythonImportsProvider.class, new PythonImportsProvider(imports))
.build();
}