From 6d884afa8da1b08288cb0108e8bbf6c22ec63393 Mon Sep 17 00:00:00 2001 From: dslomov Date: Tue, 25 Jul 2017 10:25:01 +0200 Subject: Make all WithLegacySkylarkName providers declared providers. RELNOTES: None PiperOrigin-RevId: 163042362 --- .../devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java index 79ae78973a..b78dc3d291 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java @@ -183,7 +183,7 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory RuleConfiguredTargetBuilder targetBuilder = ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild.build()) - .addProvider(ObjcProvider.class, objcProvider) + .addNativeDeclaredProvider(objcProvider) .addNativeDeclaredProvider(objcProvider) .addProvider( InstrumentedFilesProvider.class, @@ -193,7 +193,7 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory if (xcTestAppProvider.isPresent()) { // TODO(bazel-team): Stop exporting an XcTestAppProvider once objc_binary no longer creates an // application bundle. - targetBuilder.addProvider(XcTestAppProvider.class, xcTestAppProvider.get()); + targetBuilder.addNativeDeclaredProvider(xcTestAppProvider.get()); } if (maybeRunfilesSupport.isPresent()) { RunfilesSupport runfilesSupport = maybeRunfilesSupport.get(); @@ -230,7 +230,7 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory .addDepObjcProviders(protosObjcProvider.asSet()) .addNonPropagatedDepObjcProviders( ruleContext.getPrerequisites( - "non_propagated_deps", Mode.TARGET, ObjcProvider.class)) + "non_propagated_deps", Mode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR)) .setIntermediateArtifacts(intermediateArtifacts) .setAlwayslink(false) .setHasModuleMap() -- cgit v1.2.3