From 618a2bf3574015d1d341d59a34e4d0bf285ad5bf Mon Sep 17 00:00:00 2001 From: cparsons Date: Thu, 31 Aug 2017 00:48:01 +0200 Subject: Rollforward #2 of "AppleBinary and AppleStaticLibrary no longer propagate unwrapped ObjcProvider", after changes made to apple bazel rules to be compatible. RELNOTES: None. PiperOrigin-RevId: 167061765 --- src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | 2 -- .../com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | 2 -- 2 files changed, 4 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java index a65a9a5538..8e6c2bd426 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java @@ -167,8 +167,6 @@ public class AppleBinary implements RuleConfiguredTargetFactory { objcProviderBuilder.add(MULTI_ARCH_LINKED_BINARIES, outputArtifact); ObjcProvider objcProvider = objcProviderBuilder.build(); - // TODO(cparsons): Stop propagating ObjcProvider directly from this rule. - targetBuilder.addNativeDeclaredProvider(objcProvider); switch (getBinaryType(ruleContext)) { case EXECUTABLE: diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java index 16eef28170..ff3e8f9350 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java @@ -181,8 +181,6 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { ObjcProvider objcProvider = objcProviderBuilder.build(); targetBuilder - // TODO(cparsons): Remove ObjcProvider as a direct provider. - .addNativeDeclaredProvider(objcProvider) .addNativeDeclaredProvider( new AppleStaticLibraryProvider( ruleIntermediateArtifacts.combinedArchitectureArchive(), objcProvider)) -- cgit v1.2.3