From a334363a500fb9df953fe2c70184ee013ff77ccb Mon Sep 17 00:00:00 2001 From: dslomov Date: Tue, 11 Jul 2017 17:58:56 +0200 Subject: ConfigFeatureFlagProvider should be declared provider only. RELNOTES: None. PiperOrigin-RevId: 161535034 --- .../com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java | 1 - .../devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java index 2791a32edb..87ce548a4a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java @@ -100,7 +100,6 @@ public class ConfigFeatureFlag implements RuleConfiguredTargetFactory { return new RuleConfiguredTargetBuilder(ruleContext) .setFilesToBuild(NestedSetBuilder.emptySet(STABLE_ORDER)) .addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY) - .addProvider(ConfigFeatureFlagProvider.class, provider) .addNativeDeclaredProvider(provider) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java index 13ba415d34..e076f1e9db 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.config; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; -import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.SkylarkClassObject; @@ -31,8 +30,7 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; doc = "A provider used to access information about config_feature_flag rules." ) @Immutable -public class ConfigFeatureFlagProvider extends SkylarkClassObject - implements TransitiveInfoProvider { +public class ConfigFeatureFlagProvider extends SkylarkClassObject { /** Name used in Skylark for accessing ConfigFeatureFlagProvider. */ static final String SKYLARK_NAME = "FeatureFlagInfo"; -- cgit v1.2.3