diff options
| author |  Cal Peyser <cpeyser@google.com> | 2017-02-09 16:41:04 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-09 19:27:38 +0000 |
| commit | 31214a42e31e85d005bb40e96ec28e96dcd195d7 (patch) | |
| tree | 8dc69821e6f65016d777952b40c7bf3f3399d890 /src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | |
| parent | 321fc56f5f9f11b3971fcea811ad91c200c12005 (diff) | |
Generated files directory is passed to dependers as a user header search path. In the process, rename and replace the incorrectly named ObjcCommon.Builder#addUserHeaderSearchPaths
--
PiperOrigin-RevId: 147038434
MOS_MIGRATED_REVID=147038434
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index cbe8ce3b1d..b9e28b4ffb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -597,8 +597,10 @@ public abstract class CompilationSupport { xcodeProviderBuilder .addHeaders(attributes.hdrs()) .addHeaders(attributes.textualHdrs()) - .addUserHeaderSearchPaths(ObjcCommon.userHeaderSearchPaths(buildConfiguration)) - .addHeaderSearchPaths("$(WORKSPACE_ROOT)", + .addUserHeaderSearchPaths( + ObjcCommon.userHeaderSearchPaths(common.getObjcProvider(), buildConfiguration)) + .addHeaderSearchPaths( + "$(WORKSPACE_ROOT)", attributes.headerSearchPaths(buildConfiguration.getGenfilesFragment())) .addHeaderSearchPaths("$(WORKSPACE_ROOT)", includeSystemPaths) .addHeaderSearchPaths("$(SDKROOT)/usr/include", attributes.sdkIncludes()) |