From d6885e2efd61ab282578b54a584e105bb3b83574 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Tue, 6 Dec 2016 20:27:05 +0000 Subject: 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 --- .../google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java') 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(), -- cgit v1.2.3