1 files changed, 4 insertions, 21 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java
index 187f005028..fab8dfbbce 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java
@@ -21,7 +21,7 @@ import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r11.NdkMa
 import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r12.NdkMajorRevisionR12;
 import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r13.NdkMajorRevisionR13;
 import com.google.devtools.build.lib.util.OS;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CrosstoolRelease;
+import java.util.Map;
 
 /**
  * Helper methods for generating a CrosstoolRelease proto for the Android NDK based on a particular
@@ -38,8 +38,8 @@ public final class AndroidNdkCrosstools {
           "11", new NdkMajorRevisionR11(),
           "12", new NdkMajorRevisionR12(),
           "13", new NdkMajorRevisionR13());
-  public static final String LATEST_KNOWN_REVISION =
-      Iterables.getLast(KNOWN_NDK_MAJOR_REVISIONS.keySet());
+  public static final Map.Entry<String, NdkMajorRevision> LATEST_KNOWN_REVISION =
+      Iterables.getLast(KNOWN_NDK_MAJOR_REVISIONS.entrySet());
 
   /**
    * Exception thrown when there is an error creating the crosstools file.
@@ -50,23 +50,6 @@ public final class AndroidNdkCrosstools {
     }
   }
 
-  public static CrosstoolRelease create(
-      NdkRelease ndkRelease,
-      NdkPaths ndkPaths,
-      StlImpl stlImpl,
-      String hostPlatform) {
-    NdkMajorRevision ndkMajorRevision;
-    if (ndkRelease.isValid) {
-      // NDK minor revisions should be backwards compatible within a major revision, so it should be
-      // enough to check the major revision of the release.
-      ndkMajorRevision = KNOWN_NDK_MAJOR_REVISIONS.get(ndkRelease.majorRevision);
-    } else {
-      // If the NDK revision isn't valid, try using the latest one we know about.
-      ndkMajorRevision = KNOWN_NDK_MAJOR_REVISIONS.get(LATEST_KNOWN_REVISION);
-    }
-    return ndkMajorRevision.crosstoolRelease(ndkPaths, stlImpl, hostPlatform);
-  }
-
   public static String getHostPlatform(NdkRelease ndkRelease) throws NdkCrosstoolsException {
     String hostOs;
     switch (OS.getCurrent()) {
@@ -99,5 +82,5 @@ public final class AndroidNdkCrosstools {
 
   public static boolean isKnownNDKRevision(NdkRelease ndkRelease) {
     return KNOWN_NDK_MAJOR_REVISIONS.containsKey(ndkRelease.majorRevision);
-  } 
+  }
 }
 \ No newline at end of file