diff options
| author |  dslomov <dslomov@google.com> | 2017-08-21 12:52:41 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-21 14:16:34 +0200 |
| commit | 375f95b16e1a8b164d2caaa4d65a4c9b4e310bd3 (patch) | |
| tree | faf5464b37651fa52f76d63f060e6dd2b09dd522 /src/main/java/com/google/devtools/build/lib/rules/platform | |
| parent | e3684497a5a8c4bd42ff970b37c49dc70bcc3eae (diff) | |
Rename some of native declared providers according to the new naming scheme.
RELNOTES: None
PiperOrigin-RevId: 165910455
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/platform')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/platform/ConstraintValueRule.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/platform/PlatformCommon.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/platform/ConstraintValueRule.java b/src/main/java/com/google/devtools/build/lib/rules/platform/ConstraintValueRule.java index ca95be913a..b2ebaa0457 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/platform/ConstraintValueRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/platform/ConstraintValueRule.java @@ -49,7 +49,7 @@ public class ConstraintValueRule implements RuleDefinition { .allowedRuleClasses(ConstraintSettingRule.RULE_NAME) .allowedFileTypes(FileTypeSet.NO_FILE) .mandatoryProviders( - ImmutableList.of(ConstraintSettingInfo.SKYLARK_CONSTRUCTOR.id()))) + ImmutableList.of(ConstraintSettingInfo.PROVIDER.id()))) .removeAttribute("deps") .removeAttribute("data") .exemptFromConstraintChecking("this rule *defines* a constraint") diff --git a/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformCommon.java b/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformCommon.java index c793dea5f3..fdbd31b205 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformCommon.java @@ -49,7 +49,7 @@ public class PlatformCommon { structField = true ) public Provider getConstraintSettingInfoConstructor() { - return ConstraintSettingInfo.SKYLARK_CONSTRUCTOR; + return ConstraintSettingInfo.PROVIDER; } @SkylarkCallable( @@ -72,7 +72,7 @@ public class PlatformCommon { structField = true ) public Provider getToolchainInfoConstructor() { - return ToolchainInfo.SKYLARK_CONSTRUCTOR; + return ToolchainInfo.PROVIDER; } static { |