Undo breaking change of hiding android_common behind --experimental_…

…google_legacy_api

    This should be patched into 0.28.0 to fix bazelbuild/intellij#976

    Closes #8860.

    PiperOrigin-RevId: 257574106

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java

@@ -16,7 +16,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.skylarkbuildapi.Bootstrap;
-import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidApplicationResourceInfoApi.AndroidApplicationResourceInfoApiProvider;
 import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidDeviceBrokerInfoApi.AndroidDeviceBrokerInfoApiProvider;
 import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidInstrumentationInfoApi.AndroidInstrumentationInfoApiProvider;
 import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidNativeLibsInfoApi.AndroidNativeLibsInfoApiProvider;
@@ -37,24 +36,20 @@ public class AndroidBootstrap implements Bootstrap {
   private final AndroidResourcesInfoApi.AndroidResourcesInfoApiProvider<?, ?, ?>
       androidResourcesInfoProvider;
   private final AndroidNativeLibsInfoApiProvider androidNativeLibsInfoProvider;
-  private final AndroidApplicationResourceInfoApiProvider<?>
-      androidApplicationResourceInfoApiProvider;
 
   public AndroidBootstrap(
       AndroidSkylarkCommonApi<?, ?> androidCommon,
       ApkInfoApiProvider apkInfoProvider,
       AndroidInstrumentationInfoApiProvider<?> androidInstrumentationInfoProvider,
       AndroidDeviceBrokerInfoApiProvider androidDeviceBrokerInfoProvider,
       AndroidResourcesInfoApiProvider<?, ?, ?> androidResourcesInfoProvider,
-      AndroidNativeLibsInfoApiProvider androidNativeLibsInfoProvider,
-      AndroidApplicationResourceInfoApiProvider<?> androidApplicationResourceInfoApiProvider) {
+      AndroidNativeLibsInfoApiProvider androidNativeLibsInfoProvider) {
     this.androidCommon = androidCommon;
     this.apkInfoProvider = apkInfoProvider;
     this.androidInstrumentationInfoProvider = androidInstrumentationInfoProvider;
     this.androidDeviceBrokerInfoProvider = androidDeviceBrokerInfoProvider;
     this.androidResourcesInfoProvider = androidResourcesInfoProvider;
     this.androidNativeLibsInfoProvider = androidNativeLibsInfoProvider;
-    this.androidApplicationResourceInfoApiProvider = androidApplicationResourceInfoApiProvider;
   }
 
   @Override
@@ -86,10 +81,5 @@ public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
         AndroidNativeLibsInfoApi.NAME,
         FlagGuardedValue.onlyWhenExperimentalFlagIsTrue(
             FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API, androidNativeLibsInfoProvider));
-    builder.put(
-        AndroidApplicationResourceInfoApi.NAME,
-        FlagGuardedValue.onlyWhenExperimentalFlagIsTrue(
-            FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API,
-            androidApplicationResourceInfoApiProvider));
   }
 }