From 64ea3cd90e1ead5ece533ee5a3cb4ee3520527fb Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 18 Jul 2018 14:58:22 -0700 Subject: 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: 205142459 --- .../build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java | 7 ++++--- .../devtools/build/lib/rules/android/AndroidBuildViewTestCase.java | 2 +- .../devtools/build/lib/rules/android/AndroidLibraryTest.java | 2 +- .../google/devtools/build/lib/rules/android/AndroidSdkTest.java | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/test/java/com') 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 5b6dd7817e..b1c4e75193 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.get(AndroidSdkProvider.PROVIDER).getBuildToolsVersion()) + assertThat(androidSdk.getProvider(AndroidSdkProvider.class).getBuildToolsVersion()) .isEqualTo("26.0.2"); } @@ -230,7 +230,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk"); assertThat(androidSdk).isNotNull(); - assertThat(androidSdk.get(AndroidSdkProvider.PROVIDER).getAndroidJar().getExecPathString()) + assertThat(androidSdk.getProvider(AndroidSdkProvider.class).getAndroidJar().getExecPathString()) .isEqualTo("external/androidsdk/platforms/android-25/android.jar"); } @@ -253,7 +253,8 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { for (int apiLevel : apiLevels) { ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk-" + apiLevel); assertThat(androidSdk).isNotNull(); - assertThat(androidSdk.get(AndroidSdkProvider.PROVIDER).getAndroidJar().getExecPathString()) + assertThat( + androidSdk.getProvider(AndroidSdkProvider.class).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 f269d3dd80..a02601fced 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).get(AndroidSdkProvider.PROVIDER); + return getConfiguredTarget(sdk, targetConfig).getProvider(AndroidSdkProvider.class); } 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 bb9d76d744..ad167bffae 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().get(AndroidSdkProvider.PROVIDER).getAndroidJar(), + sdk.getConfiguredTarget().getProvider(AndroidSdkProvider.class).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 857ff293b2..6cd3cdea0d 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,7 +44,8 @@ public class AndroidSdkTest extends BuildViewTestCase { " shrinked_android_jar = 'android.jar',", " zipalign = 'zipalign',", ")"); - AndroidSdkProvider sdkProvider = getConfiguredTarget("//sdk").get(AndroidSdkProvider.PROVIDER); + AndroidSdkProvider sdkProvider = + getConfiguredTarget("//sdk").getProvider(AndroidSdkProvider.class); assertThat(sdkProvider.getSourceProperties().toDetailString()) .isEqualTo("[/workspace[source]]sdk/platforms/android-25/source.properties"); } -- cgit v1.2.3