diff options
| author |  cparsons <cparsons@google.com> | 2017-09-01 21:54:49 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-04 12:19:12 +0200 |
| commit | 9308a4f06379d3fdfebc5945e49ff2e0a68417fa (patch) | |
| tree | f18bb01744c0f228a62518766c151a8898baeb70 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | 78e6d51cada8a165b6c9255b9148e91bc9e3f7f1 (diff) | |
Automated rollback of commit 618a2bf3574015d1d341d59a34e4d0bf285ad5bf.
*** Reason for rollback ***
Broke several tests in nightly.
[]
*** Original change description ***
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: 167312716
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -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 e919d43cab..947d8e2cbc 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.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 732bdbdfed..b31f682c93 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 @@ -178,6 +178,8 @@ 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(), |