C++: Cleans up C++ Skylark API Feature configuration and toolchain are now mandatory arguments. Rule context is no longer a positional argument. RELNOTES:none PiperOrigin-RevId: 205367825
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index 1a6911c..fee468a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -395,15 +395,8 @@ CcCommon.checkRuleWhitelisted(skylarkRuleContext); RuleContext ruleContext = skylarkRuleContext.getRuleContext(); CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null); - if (ccToolchainProvider == null) { - ccToolchainProvider = CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext); - } FeatureConfiguration featureConfiguration = convertFromNoneable(skylarkFeatureConfiguration, null); - if (featureConfiguration == null) { - featureConfiguration = - CcCommon.configureFeaturesOrReportRuleError(ruleContext, ccToolchainProvider); - } Pair<List<Artifact>, List<Artifact>> separatedHeadersAndSources = separateSourcesFromHeaders(sources); FdoSupportProvider fdoSupport = @@ -483,15 +476,8 @@ CcCommon.checkRuleWhitelisted(skylarkRuleContext); RuleContext ruleContext = skylarkRuleContext.getRuleContext(); CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null); - if (ccToolchainProvider == null) { - ccToolchainProvider = CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext); - } FeatureConfiguration featureConfiguration = convertFromNoneable(skylarkFeatureConfiguration, null); - if (featureConfiguration == null) { - featureConfiguration = - CcCommon.configureFeaturesOrReportRuleError(ruleContext, ccToolchainProvider); - } FdoSupportProvider fdoSupport = CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext); NestedSet<String> linkopts =