diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java index 2c66d662e9accc..eab11896c26285 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java @@ -383,7 +383,7 @@ public Iterable list( protected ClassLoader getClassLoader(URL[] urls) { return new URLClassLoader( urls, - new ClassLoader(getPlatformClassLoader()) { + new ClassLoader(ClassLoader.getPlatformClassLoader()) { @Override protected Class findClass(String name) throws ClassNotFoundException { if (name.startsWith("com.google.errorprone.") @@ -407,16 +407,5 @@ protected Class findClass(String name) throws ClassNotFoundException { } } - public static ClassLoader getPlatformClassLoader() { - try { - // In JDK 9+, all platform classes are visible to the platform class loader: - // https://docs.oracle.com/javase/9/docs/api/java/lang/ClassLoader.html#getPlatformClassLoader-- - return (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null); - } catch (ReflectiveOperationException e) { - // In earlier releases, set 'null' as the parent to delegate to the boot class loader. - return null; - } - } - private BlazeJavacMain() {} }