diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-12-05 13:51:02 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-12-05 13:54:50 +0000 |
| commit | f161db2137c5ba21eef02acc20021288768ae504 (patch) | |
| tree | 98a11089633bf3edfe564b3b826acd1d6a28425c /src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | |
| parent | 080c46cbf9a8dd821b10c61d4e8ca643662f0c91 (diff) | |
Rollback of commit 7a668370e350f602ec863eb4169729885e1c7c93.
*** Reason for rollback ***
Fails test_swift_import_objc_framework of //src/test/shell/bazel/apple:bazel_apple_test
Tested on: https://cr.bazel.build/7611/
Fixes #2179.
*** Original change description ***
Split ObjcProvider.framework_dir into static and dynamic framework directories.
***
--
Change-Id: I10db5e14b219bc921bff72c45fab1455be8fa25a
Reviewed-on: https://cr.bazel.build/7311
PiperOrigin-RevId: 141043141
MOS_MIGRATED_REVID=141043141
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, 1 insertions, 4 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 752f161373..eb96e5fd15 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,10 +706,7 @@ public final class ReleaseBundlingSupport { .addTransitiveAndPropagate(ObjcProvider.DYNAMIC_FRAMEWORK_FILE, objcProvider) .addTransitiveAndPropagate( ObjcProvider.FRAMEWORK_SEARCH_PATH_ONLY, - objcProvider.get(ObjcProvider.STATIC_FRAMEWORK_DIR)) - .addTransitiveAndPropagate( - ObjcProvider.FRAMEWORK_SEARCH_PATH_ONLY, - objcProvider.get(ObjcProvider.DYNAMIC_FRAMEWORK_DIR)) + objcProvider.get(ObjcProvider.FRAMEWORK_DIR)) .build(); return new XcTestAppProvider( intermediateArtifacts.combinedArchitectureBinary(), |