diff options
| author |  dslomov <dslomov@google.com> | 2017-07-25 10:25:01 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-25 13:17:51 +0200 |
| commit | 6d884afa8da1b08288cb0108e8bbf6c22ec63393 (patch) | |
| tree | 7baa5a95ee4f6a1be551972912076bcfdead2d35 /src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java | |
| parent | 0bf2e8e7f53962dfebaacc886f983138fef5ab4e (diff) | |
Make all WithLegacySkylarkName providers declared providers.
RELNOTES: None
PiperOrigin-RevId: 163042362
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/BinaryLinkingTargetFactory.java | 6 |
1 files changed, 3 insertions, 3 deletions
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() |