Make the proto bundling behavior the default when using the new library. Take 2

--
MOS_MIGRATED_REVID=130406840

1 files changed, 0 insertions, 11 deletions

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 fc7d5cfc0d..33c1fb5541 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
@@ -69,7 +69,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   private final boolean useAbsolutePathsForActions;
   private final boolean prioritizeStaticLibs;
   private final boolean debugWithGlibcxx;
-  private final boolean experimentalAutoTopLevelUnionObjCProtos;
   @Nullable private final Label extraEntitlements;
   private final boolean deviceDebugEntitlements;
 
@@ -95,8 +94,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     this.prioritizeStaticLibs = objcOptions.prioritizeStaticLibs;
     this.debugWithGlibcxx = objcOptions.debugWithGlibcxx;
     this.extraEntitlements = objcOptions.extraEntitlements;
-    this.experimentalAutoTopLevelUnionObjCProtos =
-        objcOptions.experimentalAutoTopLevelUnionObjCProtos;
     this.deviceDebugEntitlements = objcOptions.deviceDebugEntitlements;
   }
 
@@ -271,14 +268,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   }
 
   /**
-   * Whether the experimental feature of only generating proto sources at the linking target is
-   * enabled or not.
-   */
-  public boolean experimentalAutoTopLevelUnionObjCProtos() {
-    return experimentalAutoTopLevelUnionObjCProtos;
-  }
-
-  /**
    * Returns whether device debug entitlements should be included when signing an application.
    *
    * <p>Note that debug entitlements should not be included in compilation mode {@code opt}