objc: Add flag to disable per-proto includes

--
MOS_MIGRATED_REVID=90750827

1 files changed, 10 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibrary.java
index 85ca0b0c45..f4a9a10fd3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibrary.java
@@ -153,11 +153,16 @@ public class ObjcProtoLibrary implements RuleConfiguredTargetFactory {
         .setPchFile(Optional.<Artifact>absent())
         .build();
 
-    ImmutableSet<PathFragment> searchPathEntries = new ImmutableSet.Builder<PathFragment>()
-        .add(workspaceRelativeOutputDir)
-        .add(generatedProtoDir)
-        .addAll(Iterables.transform(protoGeneratedHeaders, PARENT_PATHFRAGMENT))
-        .build();
+    ImmutableSet.Builder<PathFragment> searchPathEntriesBuilder =
+        new ImmutableSet.Builder<PathFragment>()
+            .add(workspaceRelativeOutputDir);
+     if (ruleContext.getConfiguration().getFragment(ObjcConfiguration.class).perProtoIncludes()) {
+      searchPathEntriesBuilder
+          .add(generatedProtoDir)
+          .addAll(Iterables.transform(protoGeneratedHeaders, PARENT_PATHFRAGMENT));
+     }    
+    ImmutableSet<PathFragment> searchPathEntries = searchPathEntriesBuilder.build();
+
     ObjcCommon common = new ObjcCommon.Builder(ruleContext)
         .setCompilationArtifacts(compilationArtifacts)
         .addUserHeaderSearchPaths(searchPathEntries)