Automated rollback of commit 64ea3cd90e1ead5ece533ee5a3cb4ee3520527fb.

*** Reason for rollback ***

Update the Flutter rules AndroidSdkInfo provider to FlutterAndroidSdkInfo. AndroidSdkInfo should be unique in the repo now.

*** Original change description ***

Automated rollback of commit 4d10250291a813302de64151be3b22d57e94749d.

*** Reason for rollback ***

AndroidSdkInfo is already being used by the Flutter rules.

*** Original change description ***

Expose AndroidSdkProvider to Skylark (as AndroidSdkInfo).

RELNOTES: None.
PiperOrigin-RevId: 205431461

4 files changed, 6 insertions, 8 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
index b1c4e75193..5b6dd7817e 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
@@ -210,7 +210,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase {
 
     ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk");
     assertThat(androidSdk).isNotNull();
-    assertThat(androidSdk.getProvider(AndroidSdkProvider.class).getBuildToolsVersion())
+    assertThat(androidSdk.get(AndroidSdkProvider.PROVIDER).getBuildToolsVersion())
         .isEqualTo("26.0.2");
   }
 
@@ -230,7 +230,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase {
 
     ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk");
     assertThat(androidSdk).isNotNull();
-    assertThat(androidSdk.getProvider(AndroidSdkProvider.class).getAndroidJar().getExecPathString())
+    assertThat(androidSdk.get(AndroidSdkProvider.PROVIDER).getAndroidJar().getExecPathString())
         .isEqualTo("external/androidsdk/platforms/android-25/android.jar");
   }
 
@@ -253,8 +253,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase {
     for (int apiLevel : apiLevels) {
       ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk-" + apiLevel);
       assertThat(androidSdk).isNotNull();
-      assertThat(
-          androidSdk.getProvider(AndroidSdkProvider.class).getAndroidJar().getExecPathString())
+      assertThat(androidSdk.get(AndroidSdkProvider.PROVIDER).getAndroidJar().getExecPathString())
           .isEqualTo(
               String.format("external/androidsdk/platforms/android-%d/android.jar", apiLevel));
     }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
index a02601fced..f269d3dd80 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
@@ -293,7 +293,7 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase {
 
   private AndroidSdkProvider getAndroidSdk() {
     Label sdk = targetConfig.getFragment(AndroidConfiguration.class).getSdk();
-    return getConfiguredTarget(sdk, targetConfig).getProvider(AndroidSdkProvider.class);
+    return getConfiguredTarget(sdk, targetConfig).get(AndroidSdkProvider.PROVIDER);
   }
 
   protected void checkProguardUse(String target, String artifact, boolean expectMapping,
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index ad167bffae..bb9d76d744 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -1541,7 +1541,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
 
     assertThat(linkAction.getInputs())
         .containsAllOf(
-            sdk.getConfiguredTarget().getProvider(AndroidSdkProvider.class).getAndroidJar(),
+            sdk.getConfiguredTarget().get(AndroidSdkProvider.PROVIDER).getAndroidJar(),
             getImplicitOutputArtifact(
                 a.getConfiguredTarget(),
                 a.getConfiguration(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java
index 6cd3cdea0d..857ff293b2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java
@@ -44,8 +44,7 @@ public class AndroidSdkTest extends BuildViewTestCase {
         "    shrinked_android_jar = 'android.jar',",
         "    zipalign = 'zipalign',",
         ")");
-    AndroidSdkProvider sdkProvider =
-        getConfiguredTarget("//sdk").getProvider(AndroidSdkProvider.class);
+    AndroidSdkProvider sdkProvider = getConfiguredTarget("//sdk").get(AndroidSdkProvider.PROVIDER);
     assertThat(sdkProvider.getSourceProperties().toDetailString())
         .isEqualTo("[/workspace[source]]sdk/platforms/android-25/source.properties");
   }