diff options
| author |  Cal Peyser <cpeyser@google.com> | 2016-05-24 22:24:26 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-05-25 08:35:42 +0000 |
| commit | adb09fc33661258b564d8952ade23453d1539e82 (patch) | |
| tree | c272ccfaec350ab858fa4520e3bb953fe2cd6cbe /src/objc_tools | |
| parent | 4ba4464cb96fac14ddedbf6044e2c4d2c062e50e (diff) | |
Framework paths marked for search paths only are appropriately propagated to
xcodeproj.
--
MOS_MIGRATED_REVID=123152775
Diffstat (limited to 'src/objc_tools')
| -rw-r--r-- | src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java | 14 |
1 files changed, 9 insertions, 5 deletions
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()); |