Remove experimental flags for generating robolectric R class.

RELNOTES: none
PiperOrigin-RevId: 176405273

2 files changed, 1 insertions, 37 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 8006e99ff9..df9ceccbb0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -621,18 +621,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     )
     public boolean exportsManifestDefault;
 
-
-    @Option(
-      name = "experimental_android_generate_robolectric_r_class",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help =
-          "If passed, R classes will be generated for Robolectric tests. Otherwise, only inherited"
-              + " R classes will be used."
-    )
-    public boolean generateRobolectricRClass;
-
     @Option(
         name = "experimental_android_throw_on_resource_conflict",
         defaultValue = "false",
@@ -643,16 +631,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     public boolean throwOnResourceConflict;
 
     @Option(
-        name = "experimental_use_manifest_from_resource_apk",
-        defaultValue = "true",
-        documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-        effectTags = {OptionEffectTag.UNKNOWN},
-        help = "Android library rule will use the AppManifest from the resource APK"
-            + " in the AAR file."
-    )
-    public boolean useManifestFromResourceApk;
-
-    @Option(
         name = "experimental_android_allow_android_resources",
         defaultValue = "false",
         documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
@@ -770,10 +748,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final boolean includeLibraryResourceJars;
   private final boolean exportsManifestDefault;
   private final AndroidAaptVersion androidAaptVersion;
-  private final boolean generateRobolectricRClass;
   private final boolean throwOnResourceConflict;
   private final boolean useParallelDex2Oat;
-  private final boolean useManifestFromResourceApk;
   private final boolean allowAndroidResources;
   private final boolean allowResourcesAttr;
   private final boolean inheritResourcesInTests;
@@ -810,10 +786,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.includeLibraryResourceJars = options.includeLibraryResourceJars;
     this.exportsManifestDefault = options.exportsManifestDefault;
     this.androidAaptVersion = options.androidAaptVersion;
-    this.generateRobolectricRClass = options.generateRobolectricRClass;
     this.throwOnResourceConflict = options.throwOnResourceConflict;
     this.useParallelDex2Oat = options.useParallelDex2Oat;
-    this.useManifestFromResourceApk = options.useManifestFromResourceApk;
     this.allowAndroidResources = options.allowAndroidResources;
     this.allowResourcesAttr = options.allowResourcesAttr;
     this.inheritResourcesInTests = options.inheritResourcesInTests;
@@ -961,18 +935,10 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return exportsManifestDefault;
   }
 
-  public boolean generateRobolectricRClass() {
-    return generateRobolectricRClass;
-  }
-
   boolean throwOnResourceConflict() {
     return throwOnResourceConflict;
   }
 
-  boolean useManifestFromResourceApk() {
-    return useManifestFromResourceApk;
-  }
-
   public boolean allowAndroidResources() {
     return this.allowAndroidResources;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 011c7830e8..4a4ce729ce 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -246,9 +246,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
       primaryResources = resourceApk.getPrimaryResource();
       // applicationManifest has already been checked for nullness above in this method
       ApplicationManifest applicationManifest =
-          ruleContext.getFragment(AndroidConfiguration.class).useManifestFromResourceApk()
-            ? ApplicationManifest.fromExplicitManifest(ruleContext, resourceApk.getManifest())
-            : androidSemantics.getManifestForRule(ruleContext);
+          ApplicationManifest.fromExplicitManifest(ruleContext, resourceApk.getManifest());
 
       aar = Aar.create(aarOut, applicationManifest.getManifest());
       addAarToProvider(aar, transitiveAars, transitiveAarArtifacts);