diff options
| author |  asteinb <asteinb@google.com> | 2018-05-07 13:18:48 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-07 13:20:04 -0700 |
| commit | 1a48c210d8b6f1261fb52a32dc8f3705e7f9f87c (patch) | |
| tree | ec53010e6e2697c4312e349e98146658e67d7181 /src/test/java/com/google/devtools/build/lib | |
| parent | 6f35d33c47f1a2fdbde31221883c0906c7bab800 (diff) | |
Make Aar provider into NativeInfo
This provider needs to be the new type so we can expose Aar information in Skylark
RELNOTES: none
PiperOrigin-RevId: 195710606
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
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 4acc3483b2..bc06435f46 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 @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfig import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.collect.nestedset.NestedSet; -import com.google.devtools.build.lib.rules.android.AndroidLibraryAarProvider.Aar; +import com.google.devtools.build.lib.rules.android.AndroidLibraryAarInfo.Aar; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaCompilationInfoProvider; import com.google.devtools.build.lib.rules.java.JavaCompileAction; @@ -1466,15 +1466,15 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " srcs = ['libraryOne.java'])"); ConfiguredTarget target = getConfiguredTarget("//java/android:dummyLibraryOne"); - AndroidLibraryAarProvider provider = target.getProvider(AndroidLibraryAarProvider.class); + AndroidLibraryAarInfo provider = target.get(AndroidLibraryAarInfo.PROVIDER); assertThat(provider).isNotNull(); target = getConfiguredTarget("//java/android:dummyLibraryTwo"); - provider = target.getProvider(AndroidLibraryAarProvider.class); + provider = target.get(AndroidLibraryAarInfo.PROVIDER); assertThat(provider).isNull(); target = getConfiguredTarget("//java/android:dummyParentLibrary"); - provider = target.getProvider(AndroidLibraryAarProvider.class); + provider = target.get(AndroidLibraryAarInfo.PROVIDER); assertThat(provider).isNotNull(); assertThat(provider.getTransitiveAars()).hasSize(1); } @@ -1633,7 +1633,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ConfiguredTarget target = getConfiguredTarget("//java/a:a"); - AndroidLibraryAarProvider provider = target.getProvider(AndroidLibraryAarProvider.class); + AndroidLibraryAarInfo provider = target.get(AndroidLibraryAarInfo.PROVIDER); assertThat(provider).isNotNull(); assertThat(provider .getAar() @@ -1864,7 +1864,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " manifest = 'AndroidManifest.xml',", " resource_files = ['res/values/strings.xml'])"); ConfiguredTarget target = getConfiguredTarget("//java/android:test"); - final AndroidLibraryAarProvider provider = target.getProvider(AndroidLibraryAarProvider.class); + final AndroidLibraryAarInfo provider = target.get(AndroidLibraryAarInfo.PROVIDER); final Aar test = Aar.create( @@ -1892,7 +1892,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " manifest = 'AndroidManifest.xml',", " resource_files = ['res/values/strings.xml'])"); ConfiguredTarget target = getConfiguredTarget("//java/android:test"); - final AndroidLibraryAarProvider provider = target.getProvider(AndroidLibraryAarProvider.class); + final AndroidLibraryAarInfo provider = target.get(AndroidLibraryAarInfo.PROVIDER); final Aar transitive = Aar.create( |