From be8eaa032955dd4b336fd42ecbf5135f8f7a5b12 Mon Sep 17 00:00:00 2001
From: Tim Peut <timpeut@google.com>
Date: Wed, 17 Jan 2024 10:51:30 -0800
Subject: [PATCH] Remove flag guarding for the AndroidIdeInfo provider

PiperOrigin-RevId: 599224866
Change-Id: I4f6c40f072ac371ca4540db756835f251892237f
---
 .../lib/starlarkbuildapi/android/AndroidBootstrap.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 03c56f4bcbe861..cf54b73428bc4a 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<String, Object> providers;
 
   public AndroidBootstrap(
@@ -71,6 +72,7 @@ public AndroidBootstrap(
       AndroidOptimizationInfoApi.Provider<?> androidOptimizationInfoProvider) {
 
     this.androidCommon = androidCommon;
+    this.androidIdeInfoProvider = androidIdeInfoProvider;
     ImmutableMap.Builder<String, Object> 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<String, Object> 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<String, Object> provider : providers.entrySet()) {
       builder.put(
           provider.getKey(),