Remove infoplists from objc_options. They aren't used anymore (last case removed with unknown commit)

--
MOS_MIGRATED_REVID=117003728

4 files changed, 3 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/Bundling.java b/src/main/java/com/google/devtools/build/lib/rules/objc/Bundling.java
index 1e633c5d4d..ec9da712c7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/Bundling.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/Bundling.java
@@ -37,7 +37,6 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
 import com.google.devtools.build.lib.util.Preconditions;
@@ -119,13 +118,6 @@ final class Bundling {
      * (which is merged from any such added plists plus some additional information).
      */
     public Builder addInfoplistInputFromRule(RuleContext ruleContext) {
-      if (ruleContext.attributes().has("options", BuildType.LABEL)) {
-        OptionsProvider optionsProvider = ruleContext
-            .getPrerequisite("options", Mode.TARGET, OptionsProvider.class);
-        if (optionsProvider != null) {
-          infoplistInputs.addAll(optionsProvider.getInfoplists());
-        }
-      }
       Artifact infoplist =
           ruleContext.getPrerequisiteArtifact(BundlingRule.INFOPLIST_ATTR, Mode.TARGET);
       if (infoplist != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptions.java
index 19054fd355..8473d388bc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptions.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.rules.objc;
 
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
@@ -30,8 +29,7 @@ public class ObjcOptions implements RuleConfiguredTargetFactory {
     return new RuleConfiguredTargetBuilder(ruleContext)
         .add(RunfilesProvider.class, RunfilesProvider.EMPTY)
         .add(OptionsProvider.class,
-            new OptionsProvider(ruleContext.getTokenizedStringListAttr("copts"),
-                ruleContext.getPrerequisiteArtifacts("infoplists", Mode.TARGET).list()))
+            new OptionsProvider(ruleContext.getTokenizedStringListAttr("copts")))
         .build();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
index f48fc4d39e..f22eb99dad 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
@@ -15,12 +15,10 @@
 package com.google.devtools.build.lib.rules.objc;
 
 import static com.google.devtools.build.lib.packages.Attribute.attr;
-import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.PLIST_TYPE;
 
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
-import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.syntax.Type;
@@ -38,14 +36,6 @@ public class ObjcOptionsRule implements RuleDefinition {
         This attribute is ignored and will be removed.
         <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
         .add(attr("xcode_name", Type.STRING))
-        /* <!-- #BLAZE_RULE(objc_options).ATTRIBUTE(infoplists) -->
-        infoplist files to merge with the final binary's infoplist. This
-        corresponds to a single file <i>appname</i>-Info.plist in Xcode
-        projects.
-        <i>(List of <a href="../build-ref.html#labels">labels</a>; optional)</i>
-        <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
-        .add(attr("infoplists", BuildType.LABEL_LIST)
-            .allowedFileTypes(PLIST_TYPE))
         .build();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/OptionsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/OptionsProvider.java
index 20b21bb584..e3f200c93d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/OptionsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/OptionsProvider.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.rules.objc;
 
-import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.util.Preconditions;
@@ -28,19 +27,13 @@ final class OptionsProvider
     implements TransitiveInfoProvider {
 
   private final Iterable<String> copts;
-  private final Iterable<Artifact> infoplists;
 
-  public OptionsProvider(Iterable<String> copts, Iterable<Artifact> infoplists) {
-    super(copts, infoplists);
+  public OptionsProvider(Iterable<String> copts) {
+    super(copts);
     this.copts = Preconditions.checkNotNull(copts);
-    this.infoplists = Preconditions.checkNotNull(infoplists);
   }
 
   public Iterable<String> getCopts() {
     return copts;
   }
-
-  public Iterable<Artifact> getInfoplists() {
-    return infoplists;
-  }
 }