diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-12-06 20:27:05 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-12-06 21:04:57 +0000 |
| commit | d6885e2efd61ab282578b54a584e105bb3b83574 (patch) | |
| tree | 583e41c8b7c9057da83d89348b7c475d643470e4 /src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | |
| parent | 1f31b722f9e39b97f31c0036f548bec8d81e9ff3 (diff) | |
Rollforward of "Split ObjcProvider.framework_dir into static and dynamic framework directories."
This is a rollforward of the first attempt, which broke swift rules.
--
PiperOrigin-RevId: 141210876
MOS_MIGRATED_REVID=141210876
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java index eb96e5fd15..752f161373 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java @@ -706,7 +706,10 @@ public final class ReleaseBundlingSupport { .addTransitiveAndPropagate(ObjcProvider.DYNAMIC_FRAMEWORK_FILE, objcProvider) .addTransitiveAndPropagate( ObjcProvider.FRAMEWORK_SEARCH_PATH_ONLY, - objcProvider.get(ObjcProvider.FRAMEWORK_DIR)) + objcProvider.get(ObjcProvider.STATIC_FRAMEWORK_DIR)) + .addTransitiveAndPropagate( + ObjcProvider.FRAMEWORK_SEARCH_PATH_ONLY, + objcProvider.get(ObjcProvider.DYNAMIC_FRAMEWORK_DIR)) .build(); return new XcTestAppProvider( intermediateArtifacts.combinedArchitectureBinary(), |