Drop com.oracle.graalvm.locator.jdk11.

warnerpinz · Feb 15, 2022 · a8ec0a8 · a8ec0a8
1 parent 9de0d72
commit a8ec0a8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 124 deletions.
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -959,16 +959,6 @@
       "license": "GPLv2-CPE",
       "jacoco" : "exclude",
     },
-
-    "com.oracle.graalvm.locator.jdk11" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "overlayTarget" : "com.oracle.graalvm.locator",
-      "checkstyle" : "com.oracle.truffle.api",
-      "multiReleaseJarVersion" : "11",
-      "javaCompliance" : "11+",
-      "checkPackagePrefix" : "false",
-    },
    },
 
   "licenses" : {

diff --git a/truffle/src/com.oracle.graalvm.locator.jdk11/src/com/oracle/graalvm/locator/JDKServices.java b/truffle/src/com.oracle.graalvm.locator.jdk11/src/com/oracle/graalvm/locator/JDKServices.java
diff --git a/truffle/src/com.oracle.graalvm.locator/src/com/oracle/graalvm/locator/GraalVMLocator.java b/truffle/src/com.oracle.graalvm.locator/src/com/oracle/graalvm/locator/GraalVMLocator.java
@@ -145,7 +145,7 @@ public static ClassLoader getLanguagesLoader() {
             setGraalVMProperties(homeFinder);
             if (!TruffleOptions.AOT) {
                 final List<URL> classPath = collectClassPath(homeFinder);
-                loader = new GuestLangToolsLoader(classPath.toArray(new URL[0]), JDKServices.getLocatorBaseClassLoader(GraalVMLocator.class));
+                loader = new GuestLangToolsLoader(classPath.toArray(new URL[0]), ClassLoader.getPlatformClassLoader());
             }
         }
         return loader;

diff --git a/truffle/src/com.oracle.graalvm.locator/src/com/oracle/graalvm/locator/JDKServices.java b/truffle/src/com.oracle.graalvm.locator/src/com/oracle/graalvm/locator/JDKServices.java