From 6d884afa8da1b08288cb0108e8bbf6c22ec63393 Mon Sep 17 00:00:00 2001
From: dslomov <dslomov@google.com>
Date: Tue, 25 Jul 2017 10:25:01 +0200
Subject: Make all WithLegacySkylarkName providers declared providers.

RELNOTES: None
PiperOrigin-RevId: 163042362
---
 .../com/google/devtools/build/lib/rules/objc/AppleStubBinary.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java
index 00c92f4cb7..6ef4b6a9ac 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java
@@ -111,7 +111,8 @@ public class AppleStubBinary implements RuleConfiguredTargetFactory {
 
     ApplePlatform platform = appleConfiguration.getMultiArchPlatform(platformType);
     ImmutableListMultimap<BuildConfiguration, ObjcProvider> configurationToDepsMap =
-        ruleContext.getPrerequisitesByConfiguration("deps", Mode.SPLIT, ObjcProvider.class);
+        ruleContext.getPrerequisitesByConfiguration(
+            "deps", Mode.SPLIT, ObjcProvider.SKYLARK_CONSTRUCTOR);
 
     Artifact outputArtifact =
         ObjcRuleClasses.intermediateArtifacts(ruleContext).combinedArchitectureBinary();
@@ -131,7 +132,7 @@ public class AppleStubBinary implements RuleConfiguredTargetFactory {
 
     ObjcProvider objcProvider = objcProviderBuilder.build();
     // TODO(cparsons): Stop propagating ObjcProvider directly from this rule.
-    targetBuilder.addProvider(ObjcProvider.class, objcProvider);
+    targetBuilder.addNativeDeclaredProvider(objcProvider);
 
     targetBuilder.addNativeDeclaredProvider(
         new AppleExecutableBinaryProvider(outputArtifact, objcProvider));
-- 
cgit v1.2.3