diff options
author | lpino <lpino@google.com> | 2017-10-24 16:03:00 +0200 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-10-24 17:25:52 +0200 |
commit | ea2ecbf8c0601b5a1a72dfb849dc1b86a72df533 (patch) | |
tree | cc9099f4e236510dcef22d263843513b1714d7cc /src/main/java/com/google | |
parent | 1a92d56311d4680016b4d6743579fa19b1c32d9f (diff) |
PiperOrigin-RevId: 173251680
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java | 75 |
1 files changed, 31 insertions, 44 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index b2f18dddaa..a0049989d2 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -353,51 +353,38 @@ public class BazelRuleClassProvider { } }; - /** - * Set the label for Windows DEF parser. In bazel, it should be - * @bazel_tools//tools/def_parser:def_parser, otherwise it should be null. - * - * <p>TODO(pcloudy): Remove this after Bazel rule definitions are not used internally anymore. - * Related bug b/63658220 - */ - public static final RuleSet CPP_RULES = cppRules("@bazel_tools//tools/def_parser:def_parser"); - - public static RuleSet cppRules() { - return cppRules(null); - } + public static final RuleSet CPP_RULES = + new RuleSet() { + @Override + public void init(Builder builder) { + builder.addConfig( + CppOptions.class, new CppConfigurationLoader(Functions.<String>identity())); - public static RuleSet cppRules(String defParserLabel) { - return new RuleSet() { - @Override - public void init(Builder builder) { - builder.addConfig( - CppOptions.class, new CppConfigurationLoader(Functions.<String>identity())); - - builder.addBuildInfoFactory(new CppBuildInfo()); - builder.addDynamicTransitionMaps(CppRuleClasses.DYNAMIC_TRANSITIONS_MAP); - - builder.addRuleDefinition(new CcToolchainRule(defParserLabel)); - builder.addRuleDefinition(new CcToolchainSuiteRule()); - builder.addRuleDefinition(new CcToolchainAlias.CcToolchainAliasRule()); - builder.addRuleDefinition(new CcIncLibraryRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcLinkingRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcDeclRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcBaseRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcBinaryBaseRule()); - builder.addRuleDefinition(new BazelCcBinaryRule()); - builder.addRuleDefinition(new BazelCcTestRule()); - builder.addRuleDefinition(new BazelCppRuleClasses.CcLibraryBaseRule()); - builder.addRuleDefinition(new BazelCcLibraryRule()); - builder.addRuleDefinition(new BazelCcIncLibraryRule()); - } - - @Override - public ImmutableList<RuleSet> requires() { - return ImmutableList.of(CoreRules.INSTANCE, PLATFORM_RULES); - } - }; - } + builder.addBuildInfoFactory(new CppBuildInfo()); + builder.addDynamicTransitionMaps(CppRuleClasses.DYNAMIC_TRANSITIONS_MAP); + + builder.addRuleDefinition( + new CcToolchainRule("@bazel_tools//tools/def_parser:def_parser")); + builder.addRuleDefinition(new CcToolchainSuiteRule()); + builder.addRuleDefinition(new CcToolchainAlias.CcToolchainAliasRule()); + builder.addRuleDefinition(new CcIncLibraryRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcLinkingRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcDeclRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcBaseRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcBinaryBaseRule()); + builder.addRuleDefinition(new BazelCcBinaryRule()); + builder.addRuleDefinition(new BazelCcTestRule()); + builder.addRuleDefinition(new BazelCppRuleClasses.CcLibraryBaseRule()); + builder.addRuleDefinition(new BazelCcLibraryRule()); + builder.addRuleDefinition(new BazelCcIncLibraryRule()); + } + + @Override + public ImmutableList<RuleSet> requires() { + return ImmutableList.of(CoreRules.INSTANCE, PLATFORM_RULES); + } + }; public static final RuleSet CPP_PROTO_RULES = new RuleSet() { |