Remove getAaptSupportsMainDexCreation from AndroidSdkProvider.

All android_sdk rules are required to have the apksigner binary, which was not included in the build tools until version 24.0.3. So this check is no longer necessary. Instead, we check in AndroidSdkRepositoryFunction.

RELNOTES: None
PiperOrigin-RevId: 152498753

2 files changed, 1 insertions, 46 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 2574014a6c..8392ec8b76 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
@@ -49,7 +49,6 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import org.junit.Before;
@@ -2069,49 +2068,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
   }
 
   @Test
-  public void testMainDexAaptGenerationUnsupported() throws Exception {
-    scratch.file("sdk/BUILD",
-        "android_sdk(",
-        "    name = 'sdk',",
-        "    build_tools_version = '24.0.0-rc3',",
-        "    aapt = 'aapt',",
-        "    adb = 'adb',",
-        "    aidl = 'aidl',",
-        "    android_jar = 'android.jar',",
-        "    annotations_jar = 'annotations_jar',",
-        "    apkbuilder = 'apkbuilder',",
-        "    apksigner = 'apksigner',",
-        "    dx = 'dx',",
-        "    framework_aidl = 'framework_aidl',",
-        "    main_dex_classes = 'main_dex_classes',",
-        "    main_dex_list_creator = 'main_dex_list_creator',",
-        "    proguard = 'proguard',",
-        "    shrinked_android_jar = 'shrinked_android_jar',",
-        "    zipalign = 'zipalign',",
-        "    resource_extractor = 'resource_extractor')");
-
-    scratch.file("java/a/BUILD",
-        "android_binary(",
-        "    name = 'a',",
-        "    srcs = ['A.java'],",
-        "    manifest = 'AndroidManifest.xml',",
-        "    multidex = 'legacy')");
-
-    useConfiguration(
-        "--android_sdk=//sdk:sdk", "--experimental_android_use_singlejar_for_multidex");
-    ConfiguredTarget a = getConfiguredTarget("//java/a:a");
-    Artifact intermediateJar = artifactByPath(ImmutableList.of(getCompressedUnsignedApk(a)),
-        ".apk", ".dex.zip", ".dex.zip", "main_dex_list.txt", "_intermediate.jar");
-    List<String> args = getGeneratingSpawnAction(intermediateJar).getArguments();
-    assertEquals(-1,
-        Collections.indexOfSubList(
-            args,
-            ImmutableList.of(
-                "-include",
-                targetConfig.getBinFragment() + "/java/a/proguard/a/main_dex_a_proguard.cfg")));
-  }
-
-  @Test
   public void testMainDexGenerationWithoutProguardMap() throws Exception {
     useConfiguration("--experimental_android_use_singlejar_for_multidex");
     scratchConfiguredTarget("java/foo", "abin",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
index 022cd7ad5e..b882422a1c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
@@ -49,8 +49,7 @@ public class ApkManifestActionTest {
     Artifact outputFile = createArtifact("/workspace/java/test/manifest");
     AndroidSdkProvider sdk =
         AndroidSdkProvider.create(
-            "23.0.0",
-            false, // aapt_supports_main_dex_generation
+            "24.0.3",
             createArtifact("/workspace/androidsdk/frameworkAidl"),
             null,  // aidlLib, optional
             createArtifact("/workspace/androidsdk/androidJar"),