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());