Remove --objc_per_proto_includes flag, which was obsoleted by the rule-level attribute of the same name.

RELNOTES: Remove obsolete --objc_per_proto_includes flag.

--
MOS_MIGRATED_REVID=108056207

4 files changed, 2 insertions, 21 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
index 84fafc2b0d..a2727f6e75 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
@@ -95,12 +95,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
       converter = DumpSymsConverter.class)
   public Label dumpSyms;
 
-  @Option(name = "objc_per_proto_includes",
-      defaultValue = "false",
-      category = "undocumented",
-      help = "Whether to add include path entries for every individual proto file.")
-  public boolean perProtoIncludes;
-
   @Option(name = "experimental_enable_objc_cc_deps",
       defaultValue = "false",
       category = "undocumented",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index c2e1eb0668..7a6971721c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -53,7 +53,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   private final List<String> copts;
   private final CompilationMode compilationMode;
   private final String iosSplitCpu;
-  private final boolean perProtoIncludes;
   private final List<String> fastbuildOptions;
   private final boolean enableBinaryStripping;
   private final boolean moduleMapsEnabled;
@@ -88,7 +87,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     this.experimentalGcovLabel = options.experimentalObjcGcovBinary;
     this.dumpSymsLabel = objcOptions.dumpSyms;
     this.iosSplitCpu = Preconditions.checkNotNull(objcOptions.iosSplitCpu, "iosSplitCpu");
-    this.perProtoIncludes = objcOptions.perProtoIncludes;
     this.fastbuildOptions = ImmutableList.copyOf(objcOptions.fastbuildOptions);
     this.enableBinaryStripping = objcOptions.enableBinaryStripping;
     this.moduleMapsEnabled = objcOptions.enableModuleMaps;
@@ -217,13 +215,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   }
 
   /**
-   * @return whether to add include path entries for every proto file's containing directory.
-   */
-  public boolean perProtoIncludes() {
-    return this.perProtoIncludes;
-  }
-
-  /**
    * Returns whether to perform symbol and dead-code strippings on linked binaries. The strippings
    * are performed iff --compilation_mode=opt and --objc_enable_binary_stripping are specified.
    */
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 04862e4880..ed7f10d459 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
@@ -164,11 +164,8 @@ public class ObjcProtoLibrary implements RuleConfiguredTargetFactory {
     ImmutableSet.Builder<PathFragment> searchPathEntriesBuilder =
         new ImmutableSet.Builder<PathFragment>()
             .add(workspaceRelativeOutputDir);
-    boolean libPerProtoIncludes =
-         ruleContext.attributes().get(
-             ObjcProtoLibraryRule.PER_PROTO_INCLUDES, Type.BOOLEAN);
-    if (ruleContext.getFragment(ObjcConfiguration.class).perProtoIncludes()
-        || libPerProtoIncludes) {
+    if (ruleContext.attributes().get(
+        ObjcProtoLibraryRule.PER_PROTO_INCLUDES, Type.BOOLEAN)) {
       searchPathEntriesBuilder
           .add(generatedProtoDir)
           .addAll(Iterables.transform(protoGeneratedHeaders, PARENT_PATHFRAGMENT));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
index 50dbd9133a..36774aec72 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
@@ -76,7 +76,6 @@ public class ObjcProtoLibraryRule implements RuleDefinition {
         .add(attr(PER_PROTO_INCLUDES, BOOLEAN).value(false))
         /* <!-- #BLAZE_RULE(objc_proto_library).ATTRIBUTE(per_proto_includes) -->
         If true, always add all directories to objc_library includes,
-        overriding --noobjc_per_proto_includes.
         ${SYNOPSIS}
         <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
         .add(attr(COMPILE_PROTOS_ATTR, LABEL)