Skip to content

Commit 2834613

Browse files
lberkiCopybara-Service
authored and
Copybara-Service
committed
Include also ext jars in the bootclasspath jar.
Fixes bazelbuild#6060. RELNOTES: None. PiperOrigin-RevId: 212493359
1 parent e632d50 commit 2834613

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

tools/jdk/DumpPlatformClassPath.java

+23-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
import java.nio.file.Paths;
3232
import java.nio.file.SimpleFileVisitor;
3333
import java.nio.file.attribute.BasicFileAttributes;
34+
import java.util.ArrayList;
3435
import java.util.Arrays;
3536
import java.util.EnumSet;
3637
import java.util.GregorianCalendar;
3738
import java.util.HashMap;
39+
import java.util.List;
3840
import java.util.Map;
3941
import java.util.jar.JarEntry;
4042
import java.util.jar.JarFile;
@@ -71,12 +73,29 @@ public static void main(String[] args) throws Exception {
7173
if (javaHome.endsWith("jre")) {
7274
javaHome = javaHome.getParent();
7375
}
74-
for (String jar :
75-
Arrays.asList("rt.jar", "resources.jar", "jsse.jar", "jce.jar", "charsets.jar")) {
76+
77+
List<Path> jars = new ArrayList<>();
78+
79+
Path extDir = javaHome.resolve("jre/lib/ext");
80+
if (Files.exists(extDir)) {
81+
for (Path extJar : Files.newDirectoryStream(extDir, "*.jar")) {
82+
jars.add(extJar);
83+
}
84+
}
85+
86+
for (String jar : Arrays.asList(
87+
"rt.jar",
88+
"resources.jar",
89+
"jsse.jar",
90+
"jce.jar",
91+
"charsets.jar")) {
7692
Path path = javaHome.resolve("jre/lib").resolve(jar);
77-
if (!Files.exists(path)) {
78-
continue;
93+
if (Files.exists(path)) {
94+
jars.add(path);
7995
}
96+
}
97+
98+
for (Path path : jars) {
8099
try (JarFile jf = new JarFile(path.toFile())) {
81100
jf.stream()
82101
.forEachOrdered(

0 commit comments

Comments
 (0)