From 5fa7ddb3993a1f44834fc1783f9edd1e7b9893da Mon Sep 17 00:00:00 2001 From: Luca Di Grazia Date: Sun, 4 Sep 2022 19:29:49 +0200 Subject: [PATCH] Undo breaking change of hiding android_common behind --experimental_google_legacy_api This should be patched into 0.28.0 to fix https://github.com/bazelbuild/intellij/issues/976 Closes #8860. PiperOrigin-RevId: 257574106 --- .../skylarkbuildapi/android/AndroidBootstrap.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java index 2a0ff66f286..de0fbe0215c 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java +++ b/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,8 +36,6 @@ public class AndroidBootstrap implements Bootstrap { private final AndroidResourcesInfoApi.AndroidResourcesInfoApiProvider androidResourcesInfoProvider; private final AndroidNativeLibsInfoApiProvider androidNativeLibsInfoProvider; - private final AndroidApplicationResourceInfoApiProvider - androidApplicationResourceInfoApiProvider; public AndroidBootstrap( AndroidSkylarkCommonApi androidCommon, @@ -46,15 +43,13 @@ public AndroidBootstrap( 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 builder) { AndroidNativeLibsInfoApi.NAME, FlagGuardedValue.onlyWhenExperimentalFlagIsTrue( FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API, androidNativeLibsInfoProvider)); - builder.put( - AndroidApplicationResourceInfoApi.NAME, - FlagGuardedValue.onlyWhenExperimentalFlagIsTrue( - FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API, - androidApplicationResourceInfoApiProvider)); } }