From adb09fc33661258b564d8952ade23453d1539e82 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Tue, 24 May 2016 22:24:26 +0000 Subject: Framework paths marked for search paths only are appropriately propagated to xcodeproj. -- MOS_MIGRATED_REVID=123152775 --- .../devtools/build/xcode/xcodegen/XcodeprojGeneration.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/objc_tools') diff --git a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java index f92efd48ce..c3f70725e4 100644 --- a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java +++ b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java @@ -500,11 +500,15 @@ public class XcodeprojGeneration { targetBuildConfigMap.put("USER_HEADER_SEARCH_PATHS", headerSearchPaths( plus(targetControl.getUserHeaderSearchPathList(), "$(WORKSPACE_ROOT)"))); - targetBuildConfigMap.put("HEADER_SEARCH_PATHS", - headerSearchPaths( - plus(targetControl.getHeaderSearchPathList(), "$(inherited)"))); - targetBuildConfigMap.put("FRAMEWORK_SEARCH_PATHS", - frameworkSearchPaths(targetControl.getFrameworkList())); + targetBuildConfigMap.put( + "HEADER_SEARCH_PATHS", + headerSearchPaths(plus(targetControl.getHeaderSearchPathList(), "$(inherited)"))); + targetBuildConfigMap.put( + "FRAMEWORK_SEARCH_PATHS", + frameworkSearchPaths( + Iterables.concat( + targetControl.getFrameworkList(), + targetControl.getFrameworkSearchPathOnlyList()))); targetBuildConfigMap.put("WORKSPACE_ROOT", workspaceRoot.toString()); -- cgit v1.2.3