diff options
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 | 28 |
1 files changed, 1 insertions, 27 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 442a847494..d06a374f07 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 @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RunfilesSupport; -import com.google.devtools.build.lib.analysis.SkylarkProviders; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; @@ -38,7 +37,6 @@ import com.google.devtools.build.lib.rules.objc.ObjcCommon.CompilationAttributes import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes; import com.google.devtools.build.lib.rules.objc.ReleaseBundlingSupport.LinkedBinary; import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider; -import com.google.devtools.build.lib.syntax.ClassObject.SkylarkClassObject; /** * Implementation for rules that link binaries. @@ -173,10 +171,7 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory .addProvider(ObjcProvider.class, objcProvider) .addProvider( InstrumentedFilesProvider.class, - compilationSupport.getInstrumentedFilesProvider(common)) - .addSkylarkTransitiveInfo( - ObjcProvider.OBJC_SKYLARK_PROVIDER_NAME, - common.getObjcProvider().toSkylarkProvider()); + compilationSupport.getInstrumentedFilesProvider(common)); if (xcTestAppProvider.isPresent()) { // TODO(bazel-team): Stop exporting an XcTestAppProvider once objc_binary no longer creates an // application bundle. @@ -222,8 +217,6 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory .setHasModuleMap() .setLinkedBinary(intermediateArtifacts.strippedSingleArchitectureBinary()); - builder.addDepObjcProviders(createSkylarkObjcProviders(ruleContext)); - if (ObjcRuleClasses.objcConfiguration(ruleContext).generateDebugSymbols() || ObjcRuleClasses.objcConfiguration(ruleContext).generateDsym()) { builder.addDebugArtifacts(DsymOutputType.APP); @@ -237,25 +230,6 @@ abstract class BinaryLinkingTargetFactory implements RuleConfiguredTargetFactory } /** - * Constructs an ObjcProvider instance for each skylark objc provider in this target's - * dependencies. - */ - private Iterable<ObjcProvider> createSkylarkObjcProviders(RuleContext ruleContext) { - ImmutableList.Builder<ObjcProvider> skylarkProviderListBuilder = ImmutableList.builder(); - for (SkylarkProviders skylarkProviders : - ruleContext.getPrerequisites("deps", Mode.TARGET, SkylarkProviders.class)) { - Object objcSkylarkProvider = - skylarkProviders.getValue(ObjcProvider.OBJC_SKYLARK_PROVIDER_TO_EXPORT_NAME); - if (objcSkylarkProvider != null) { - ObjcProvider objcProviderFromSkylark = - ObjcProvider.fromSkylarkProvider((SkylarkClassObject) objcSkylarkProvider); - skylarkProviderListBuilder.add(objcProviderFromSkylark); - } - } - return skylarkProviderListBuilder.build(); - } - - /** * Performs additional configuration of the target. The default implementation does nothing, but * subclasses may override it to add logic. */ |