1 files changed, 10 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java
index 09c369904d..c2d85ff144 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java
@@ -73,6 +73,10 @@ public class AndroidNdkCrosstoolsTest {
       this.ndkDirectoriesFilename = ndkDirectoriesFilename;
     }
 
+    NdkMajorRevision getNdkMajorRevision() {
+      return AndroidNdkCrosstools.KNOWN_NDK_MAJOR_REVISIONS.get(ndkRelease.majorRevision);
+    }
+
     ImmutableSet<String> getNdkFiles() throws IOException {
       String ndkFilesFileContent =
           ResourceFileLoader.loadResource(AndroidNdkCrosstoolsTest.class, ndkFilesFilename);
@@ -134,7 +138,7 @@ public class AndroidNdkCrosstoolsTest {
     for (StlImpl ndkStlImpl : StlImpls.get(ndkPaths)) {
       // Protos are immutable, so this can be shared between tests.
       CrosstoolRelease crosstool =
-          AndroidNdkCrosstools.create(params.ndkRelease, ndkPaths, ndkStlImpl, HOST_PLATFORM);
+          params.getNdkMajorRevision().crosstoolRelease(ndkPaths, ndkStlImpl, HOST_PLATFORM);
       crosstools.add(crosstool);
       stlFilegroupsBuilder.putAll(ndkStlImpl.getFilegroupNamesAndFilegroupFileGlobPatterns());
     }
@@ -144,18 +148,18 @@ public class AndroidNdkCrosstoolsTest {
     ndkFiles = params.getNdkFiles();
     ndkDirectories = params.getNdkDirectories();
   }
-  
+
   @Test
   public void testPathsExist() throws Exception {
 
     for (CrosstoolRelease crosstool : crosstoolReleases) {
       for (CToolchain toolchain : crosstool.getToolchainList()) {
-  
+
         // Test that all tool paths exist.
         for (ToolPath toolpath : toolchain.getToolPathList()) {
           assertThat(ndkFiles).contains(toolpath.getPath());
         }
-  
+
         // Test that all cxx_builtin_include_directory paths exist.
         for (String includeDirectory : toolchain.getCxxBuiltinIncludeDirectoryList()) {
           // Special case for builtin_sysroot.
@@ -164,13 +168,13 @@ public class AndroidNdkCrosstoolsTest {
             assertThat(ndkDirectories).contains(path);
           }
         }
-  
+
         // Test that the builtin_sysroot path exists.
         {
           String builtinSysroot = NdkPaths.stripRepositoryPrefix(toolchain.getBuiltinSysroot());
           assertThat(ndkDirectories).contains(builtinSysroot);
         }
-  
+
         // Test that all include directories added through unfiltered_cxx_flag exist.
         for (String flag : toolchain.getUnfilteredCxxFlagList()) {
           if (!flag.equals("-isystem")) {