From c94572bea5ce6bdc0ccda9789e5be6fb3f4c173b Mon Sep 17 00:00:00 2001 From: Andreas Fuchs <40823098+foxandi@users.noreply.github.com> Date: Fri, 22 Apr 2022 04:06:51 -0700 Subject: [PATCH] Include jdk.crypto.mscapi in minimized Windows embedded JDK Fixes: https://github.com/bazelbuild/bazel/issues/15305 Closes #15306. PiperOrigin-RevId: 443624925 --- src/minimize_jdk.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/minimize_jdk.sh b/src/minimize_jdk.sh index f4f08d94cf4e94..1f897528bd021a 100755 --- a/src/minimize_jdk.sh +++ b/src/minimize_jdk.sh @@ -47,6 +47,10 @@ if [[ "$UNAME" =~ msys_nt* ]]; then cd "tmp.$$" unzip "../$fulljdk" cd $FULL_JDK_DIR + # We have to add this module explicitly because it is windows specific, it allows + # the usage of the Windows truststore + # e.g. -Djavax.net.ssl.trustStoreType=WINDOWS-ROOT + modules="$modules,jdk.crypto.mscapi" ./bin/jlink --module-path ./jmods/ --add-modules "$modules" \ --vm=server --strip-debug --no-man-pages \ --output reduced