Simplify plmerge and bundlemerge by removing deprecated functionality.

RELNOTES:

--
MOS_MIGRATED_REVID=115804885

2 files changed, 3 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java
index 40a0b84479..70925770e5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.rules.objc;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteSource;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
@@ -36,22 +35,17 @@ final class BundleMergeControlBytes extends ByteSource {
   private final Bundling rootBundling;
   private final Artifact mergedIpa;
   private final AppleConfiguration appleConfiguration;
-  private final ImmutableSet<TargetDeviceFamily> families;
 
   public BundleMergeControlBytes(
-      Bundling rootBundling, Artifact mergedIpa, AppleConfiguration appleConfiguration,
-      ImmutableSet<TargetDeviceFamily> families) {
+      Bundling rootBundling, Artifact mergedIpa, AppleConfiguration appleConfiguration) {
     this.rootBundling = Preconditions.checkNotNull(rootBundling);
     this.mergedIpa = Preconditions.checkNotNull(mergedIpa);
     this.appleConfiguration = Preconditions.checkNotNull(appleConfiguration);
-    this.families = Preconditions.checkNotNull(families);
   }
 
   @Override
   public InputStream openStream() {
-    return control("", rootBundling)
-        .toByteString()
-        .newInput();
+    return control("", rootBundling).toByteString().newInput();
   }
 
   private Control control(String mergeZipPrefix, Bundling bundling) {
@@ -77,10 +71,6 @@ final class BundleMergeControlBytes extends ByteSource {
           .build());
     }
 
-    for (TargetDeviceFamily targetDeviceFamily : families) {
-      control.addTargetDeviceFamily(targetDeviceFamily.name());
-    }
-
     control.setOutFile(mergedIpa.getExecPathString());
 
     for (Artifact linkedBinary : bundling.getCombinedArchitectureBinary().asSet()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
index 9e15d8986d..9c4d7223f6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
@@ -761,8 +761,7 @@ public final class ReleaseBundlingSupport {
         new BundleMergeControlBytes(
             bundling,
             intermediateArtifacts.unprocessedIpa(),
-            ruleContext.getFragment(AppleConfiguration.class),
-            bundleSupport.targetDeviceFamilies());
+            ruleContext.getFragment(AppleConfiguration.class));
 
     ruleContext.registerAction(
         new BinaryFileWriteAction(