1 files changed, 0 insertions, 116 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index f6398bc88d..a0d1ed3c8a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -450,122 +450,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
           .isEmpty();
   }
 
-  @Test
-  public void testIncrementalDexingWithAidlRuntimeDependency() throws Exception {
-    useConfiguration(
-        "--incremental_dexing", "--incremental_dexing_binary_types=all", "--android_sdk=//sdk:sdk");
-
-    scratch.file("sdk/BUILD",
-        "android_sdk(",
-        "    name = 'sdk',",
-        "    aapt = 'aapt',",
-        "    adb = 'adb',",
-        "    aidl = 'aidl',",
-        "    android_jar = 'android.jar',",
-        "    annotations_jar = 'annotations_jar',",
-        "    apksigner = 'apksigner',",
-        "    dx = 'dx',",
-        "    framework_aidl = 'framework_aidl',",
-        // TODO(b/35630874): set aidl_lib in MockAndroidSupport once b/35630874 is fixed
-        "    aidl_lib = ':aidl_runtime',",
-        "    main_dex_classes = 'main_dex_classes',",
-        "    main_dex_list_creator = 'main_dex_list_creator',",
-        "    proguard = 'proguard',",
-        "    shrinked_android_jar = 'shrinked_android_jar',",
-        "    zipalign = 'zipalign',",
-        ")",
-        "java_library(",
-        "    name = 'aidl_runtime',",
-        "    srcs = ['AidlRuntime.java'],",
-        ")");
-    scratch.file(
-        "java/com/google/android/BUILD",
-        "android_library(",
-        "  name = 'dep',",
-        "  srcs = ['dep.java'],",
-        "  manifest = 'AndroidManifest.xml',",
-        "  resource_files = glob(['res/**']),",
-        "  idl_srcs = ['dep.aidl'],",
-        ")",
-        "android_binary(",
-        "  name = 'top',",
-        "  srcs = ['foo.java', 'bar.srcjar'],",
-        "  manifest = 'AndroidManifest.xml',",
-        "  deps = [':dep'],",
-        ")");
-
-    ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top");
-    assertNoEvents();
-
-    Action shardAction =
-        getGeneratingAction(getBinArtifact("_dx/top/classes.jar", topTarget));
-    for (String basename : ActionsTestUtil.baseArtifactNames(getNonToolInputs(shardAction))) {
-      // all jars are converted to dex archives
-      assertThat(!basename.contains(".jar") || basename.endsWith(".jar.dex.zip"))
-          .named(basename).isTrue();
-    }
-    assertThat(ActionsTestUtil.baseArtifactNames(shardAction.getInputs()))
-        .contains("libaidl_runtime.jar.dex.zip");
-  }
-
-  /** Regression for b/35630874. */
-  @Test
-  public void testIncrementalDexingWithoutAidlRuntimeDependency() throws Exception {
-    useConfiguration(
-        "--incremental_dexing", "--incremental_dexing_binary_types=all", "--android_sdk=//sdk:sdk");
-
-    scratch.file("sdk/BUILD",
-        "android_sdk(",
-        "    name = 'sdk',",
-        "    aapt = 'aapt',",
-        "    adb = 'adb',",
-        "    aidl = 'aidl',",
-        "    android_jar = 'android.jar',",
-        "    annotations_jar = 'annotations_jar',",
-        "    apksigner = 'apksigner',",
-        "    dx = 'dx',",
-        "    framework_aidl = 'framework_aidl',",
-        // TODO(b/35630874): set aidl_lib in MockAndroidSupport once b/35630874 is fixed
-        "    aidl_lib = ':aidl_runtime',",
-        "    main_dex_classes = 'main_dex_classes',",
-        "    main_dex_list_creator = 'main_dex_list_creator',",
-        "    proguard = 'proguard',",
-        "    shrinked_android_jar = 'shrinked_android_jar',",
-        "    zipalign = 'zipalign',",
-        ")",
-        "java_library(",
-        "    name = 'aidl_runtime',",
-        "    srcs = ['AidlRuntime.java'],",
-        ")");
-    scratch.file(
-        "java/com/google/android/BUILD",
-        "android_library(",
-        "  name = 'dep',",
-        "  srcs = ['dep.java'],",
-        "  manifest = 'AndroidManifest.xml',",
-        "  resource_files = glob(['res/**']),",
-        ")",
-        "android_binary(",
-        "  name = 'top',",
-        "  srcs = ['foo.java', 'bar.srcjar'],",
-        "  manifest = 'AndroidManifest.xml',",
-        "  deps = [':dep'],",
-        ")");
-
-    ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top");
-    assertNoEvents();
-
-    Action shardAction =
-        getGeneratingAction(getBinArtifact("_dx/top/classes.jar", topTarget));
-    for (String basename : ActionsTestUtil.baseArtifactNames(getNonToolInputs(shardAction))) {
-      // all jars are converted to dex archives
-      assertThat(!basename.contains(".jar") || basename.endsWith(".jar.dex.zip"))
-          .named(basename).isTrue();
-    }
-    assertThat(ActionsTestUtil.baseArtifactNames(shardAction.getInputs()))
-        .doesNotContain("libaidl_runtime.jar.dex.zip");
-  }
-
   /** Regression test for http://b/33173461. */
   @Test
   public void testIncrementalDexingUsesDexArchives_binaryDependingOnAliasTarget()