diff options
| author |  buchgr <buchgr@google.com> | 2017-07-17 13:34:06 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-17 13:43:49 +0200 |
| commit | 88518522a18df5788736be6151fc67992efe2aad (patch) | |
| tree | 5ec29bbc8620a9b1f461a0bf90ae9f975c0c186c /src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | |
| parent | 01ddfb7bf418b371859de62f4eab2f41ea9a4a4a (diff) | |
Automated rollback of commit 4594b7fd6c2516341cdd6e57f9eaaf22cf691f95.
*** Reason for rollback ***
It breaks examples/tutorial on ci.bazel.build [1] with error:
object of type 'Target' has no field 'objc'.
[1] http://ci.bazel.io/view/Dashboard/job/Tutorial/BAZEL_VERSION=HEAD,PLATFORM_NAME=darwin-x86_64/1023/console
*** Original change description ***
AppleBinary and AppleStaticLibrary no longer propagate unwrapped ObjcProvider.
This will prevent dependencies on apple_binary and apple_static_library from objc_library and other lower-level rules.
RELNOTES: None.
PiperOrigin-RevId: 162195726
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | 2 |
1 files changed, 2 insertions, 0 deletions
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(), |