diff options
| author |  hlopko <hlopko@google.com> | 2017-05-22 11:33:47 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-05-22 14:40:28 +0200 |
| commit | b36774ac955c5af15d59df36c66dc69f89674a49 (patch) | |
| tree | 4c74e6d5fdc77c511dff5708177bdfe42eeb57c0 /src/main/java/com/google/devtools/build/lib/rules/cpp/proto | |
| parent | bbb9bbc84a826345f118b0d94f337165a341af30 (diff) | |
Extract :cc_toolchain as constant
And while at it cleanup all the calls of CppHelper.getToolchain and
CppHelper.getFdoSupport.
RELNOTES: None.
PiperOrigin-RevId: 156716291
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/proto')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java index d4d94638bf..0d44e352ed 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java @@ -44,6 +44,7 @@ import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.cpp.CcCommon; import com.google.devtools.build.lib.rules.cpp.CcLibraryHelper; +import com.google.devtools.build.lib.rules.cpp.CcToolchain; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; @@ -118,7 +119,9 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect ImmutableList.<Class<? extends TransitiveInfoProvider>>of( ProtoLangToolchainProvider.class)) .value(PROTO_TOOLCHAIN_LABEL)) - .add(attr(":cc_toolchain", LABEL).value(ccToolchainAttrValue)) + .add( + attr(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, LABEL) + .value(ccToolchainAttrValue)) .add( attr(":lipo_context_collector", LABEL) .cfg(CppRuleClasses.LipoTransition.LIPO_COLLECTOR) @@ -228,7 +231,7 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect cppSemantics, featureConfiguration, ccToolchain(ruleContext), - CppHelper.getFdoSupport(ruleContext, ":cc_toolchain")); + CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext)); helper.enableCcSpecificLinkParamsProvider(); helper.enableCcNativeLibrariesProvider(); // TODO(dougk): Configure output artifact with action_config @@ -245,7 +248,8 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect private static CcToolchainProvider ccToolchain(RuleContext ruleContext) { return CppHelper.getToolchain( - ruleContext, ruleContext.getPrerequisite(":cc_toolchain", TARGET)); + ruleContext, + ruleContext.getPrerequisite(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, TARGET)); } private ImmutableSet<Artifact> getOutputFiles( |