Actually run AarImportTest ?

Also, fix it to not rely on the Android split transition being disabled.

RELNOTES: None
PiperOrigin-RevId: 175861670

2 files changed, 26 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
index 42a4434b99..207c902f6b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
@@ -255,16 +255,22 @@ public class AarImportTest extends BuildViewTestCase {
   public void testExportsManifest() throws Exception {
     Artifact binaryMergedManifest =
         getConfiguredTarget("//java:app").getProvider(ApkProvider.class).getMergedManifest();
-    assertThat(getGeneratingAction(binaryMergedManifest).getInputs())
+    // Compare root relative path strings instead of artifacts due to difference in configuration
+    // caused by the Android split transition.
+    assertThat(
+        Iterables.transform(
+            getGeneratingAction(binaryMergedManifest).getInputs(),
+            Artifact::getRootRelativePathString))
         .containsAllOf(getAndroidManifest("//a:foo"), getAndroidManifest("//a:bar"));
   }
 
-  private Artifact getAndroidManifest(String aarImport) throws Exception {
+  private String getAndroidManifest(String aarImport) throws Exception {
     return getConfiguredTarget(aarImport)
         .getProvider(AndroidResourcesProvider.class)
         .getDirectAndroidResources()
         .toList()
         .get(0)
-        .getManifest();
+        .getManifest()
+        .getRootRelativePathString();
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
index d404030666..8b359aed15 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD
@@ -11,6 +11,23 @@ filegroup(
 )
 
 java_test(
+    name = "AarImportTest",
+    srcs = ["AarImportTest.java"],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib:android-rules",
+        "//src/main/java/com/google/devtools/build/lib:build-base",
+        "//src/main/java/com/google/devtools/build/lib:java-compilation",
+        "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+        "//src/test/java/com/google/devtools/build/lib:actions_testutil",
+        "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
+        "//third_party:guava",
+        "//third_party:junit4",
+        "//third_party:truth",
+    ],
+)
+
+java_test(
     name = "AndroidSkylarkSplitTransitionTest",
     srcs = ["AndroidSkylarkSplitTransitionTest.java"],
     deps = [