When building protos on a linking target, propagate the protos header search paths so that ios_test targets can access them without the need to use non_propagate_deps for protos.

--
MOS_MIGRATED_REVID=130796608

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
index d8efbfbf8a..5014ead312 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
@@ -223,7 +223,12 @@ final class ProtobufSupport {
       actionId++;
     }
 
-    commonBuilder.addDirectDependencyHeaderSearchPaths(userHeaderSearchPaths);
+    if (isLinkingTarget()) {
+      commonBuilder.addUserHeaderSearchPaths(userHeaderSearchPaths);
+    } else {
+      commonBuilder.addDirectDependencyHeaderSearchPaths(userHeaderSearchPaths);
+    }
+
     return Optional.of(commonBuilder.build().getObjcProvider());
   }