diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidBootstrap.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidBootstrap.java index 4610afe7e52cd4..2b7052ee3f8649 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidBootstrap.java @@ -38,6 +38,7 @@ public class AndroidBootstrap implements Bootstrap { PackageIdentifier.createUnchecked("", "tools/build_defs/android")); private final AndroidStarlarkCommonApi androidCommon; + private final AndroidIdeInfoProviderApi.Provider androidIdeInfoProvider; private final ImmutableMap providers; public AndroidBootstrap( @@ -71,6 +72,7 @@ public AndroidBootstrap( AndroidOptimizationInfoApi.Provider androidOptimizationInfoProvider) { this.androidCommon = androidCommon; + this.androidIdeInfoProvider = androidIdeInfoProvider; ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(ApkInfoApi.NAME, apkInfoProvider); builder.put(AndroidInstrumentationInfoApi.NAME, androidInstrumentationInfoProvider); @@ -86,7 +88,6 @@ public AndroidBootstrap( builder.put(AndroidLibraryAarInfoApi.NAME, androidLibraryAarInfoProvider); builder.put(AndroidProguardInfoApi.NAME, androidProguardInfoProvider); builder.put(AndroidIdlProviderApi.NAME, androidIdlProvider); - builder.put(AndroidIdeInfoProviderApi.NAME, androidIdeInfoProvider); builder.put(AndroidPreDexJarProviderApi.NAME, androidPreDexJarProviderApiProvider); builder.put(AndroidCcLinkParamsProviderApi.NAME, androidCcLinkParamsProviderApiProvider); builder.put(DataBindingV2ProviderApi.NAME, dataBindingV2ProviderApiProvider); @@ -118,6 +119,11 @@ public void addBindingsToBuilder(ImmutableMap.Builder builder) { androidCommon, allowedRepositories)); + // Expose AndroidIdeInfo without any flag guarding. This provider is referenced by the intellij + // aspect (for all languages, not just Android) and we do not want to ask all users to put + // `--experimental_google_legacy_api` in their bazelrc. + builder.put(AndroidIdeInfoProviderApi.NAME, androidIdeInfoProvider); + for (Map.Entry provider : providers.entrySet()) { builder.put( provider.getKey(),