diff options
| author |  cparsons <cparsons@google.com> | 2017-09-22 11:12:31 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-09-25 09:37:13 -0400 |
| commit | e8d3c223185a8e1c0b659a5c70d2987460460d06 (patch) | |
| tree | 055b6295048f6b5ce3a7bac6f88a067536c0592d /src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | |
| parent | da8386aaf23ba4b76de542d7c4d37f057b4b8683 (diff) | |
Contingent on a flag --experimental_objc_provider_from_linked, apple_binary and apple_static_library no longer propagate ObjcProvider.
RELNOTES: None.
PiperOrigin-RevId: 169690934
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 | 6 |
1 files changed, 4 insertions, 2 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 ac871f310a..0a32e6124d 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 @@ -177,9 +177,11 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { ObjcProvider objcProvider = objcProviderBuilder.build(); + if (appleConfiguration.shouldLinkingRulesPropagateObjc()) { + targetBuilder.addNativeDeclaredProvider(objcProvider); + } + targetBuilder - // TODO(cparsons): Remove ObjcProvider as a direct provider. - .addNativeDeclaredProvider(objcProvider) .addNativeDeclaredProvider( new AppleStaticLibraryProvider( ruleIntermediateArtifacts.combinedArchitectureArchive(), |