diff options
| author |  allevato <allevato@google.com> | 2017-07-26 18:28:33 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-27 09:05:10 +0200 |
| commit | bb40819d60277bbfb50d8ec377378bdeb850b4ad (patch) | |
| tree | 3e015bc594478e86c2b99b3e0779e53af64de1b1 /src/main/java | |
| parent | 52b489c56dd379b2afd96ed4069bd37eaa1f66b4 (diff) | |
Automated rollback of commit 9e3018109b189a345cd9b353729c7f31ac209bc9.
*** Reason for rollback ***
Broke bundling of objc_frameworks.
PiperOrigin-RevId: 163215950
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | 2 |
2 files changed, 4 insertions, 0 deletions
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 c7fe14fa3b..d296905dfc 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 @@ -164,6 +164,8 @@ 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.addProvider(ObjcProvider.class, 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 9aeb22456b..49575aa0de 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 @@ -180,6 +180,8 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { ObjcProvider objcProvider = objcProviderBuilder.build(); targetBuilder + // TODO(cparsons): Remove ObjcProvider as a direct provider. + .addProvider(ObjcProvider.class, objcProvider) .addNativeDeclaredProvider( new AppleStaticLibraryProvider( ruleIntermediateArtifacts.combinedArchitectureArchive(), |