From 346b8c12960256f4926c0ee4c250ab8f36df3c21 Mon Sep 17 00:00:00 2001 From: cushon Date: Tue, 28 Nov 2017 16:02:13 -0800 Subject: Extract CONTAINS_JAVA_PROVIDER to a shared constant Pre-factoring for unknown commit. PiperOrigin-RevId: 177232397 --- .../build/lib/bazel/rules/java/BazelJavaRuleClasses.java | 9 +-------- .../google/devtools/build/lib/rules/java/JavaRuleClasses.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java index 95ff1d00b7..bc8c891c7b 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java @@ -21,6 +21,7 @@ import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; import static com.google.devtools.build.lib.packages.BuildType.NODEP_LABEL_LIST; import static com.google.devtools.build.lib.packages.BuildType.TRISTATE; import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fromFunctions; +import static com.google.devtools.build.lib.rules.java.JavaRuleClasses.CONTAINS_JAVA_PROVIDER; import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; import static com.google.devtools.build.lib.syntax.Type.STRING; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; @@ -74,14 +75,6 @@ public class BazelJavaRuleClasses { JavaSemantics.JAVA_LIBRARY_CLASS_JAR, JavaSemantics.JAVA_LIBRARY_SOURCE_JAR); - /** - * Meant to be an element of {@code mandatoryProvidersLists} in order to accept rules providing - * a {@link JavaInfo} through an attribute. Other providers can be included in - * {@code mandatoryProvidersLists} as well. - */ - public static final ImmutableList CONTAINS_JAVA_PROVIDER = - ImmutableList.of(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())); - public static final ImmutableList CONTAINS_CC_LINK_PARAMS = ImmutableList.of( SkylarkProviderIdentifier.forKey(CcLinkParamsInfo.PROVIDER.getKey())); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java index 834865a987..3afa1f5c37 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java @@ -17,12 +17,14 @@ package com.google.devtools.build.lib.rules.java; import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL; +import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; +import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier; /** * Common rule class definitions for Java rules. @@ -52,4 +54,12 @@ public class JavaRuleClasses { .build(); } } + + /** + * Meant to be an element of {@code mandatoryProvidersLists} in order to accept rules providing a + * {@link JavaInfo} through an attribute. Other providers can be included in {@code + * mandatoryProvidersLists} as well. + */ + public static final ImmutableList CONTAINS_JAVA_PROVIDER = + ImmutableList.of(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())); } -- cgit v1.2.3