@@ -52,10 +52,14 @@ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
5252
5353TARGETS += $(BUILD_WB_JAR)
5454
55+ ifeq ($(call isTargetOs, linux), false)
56+ BUILD_TEST_LIB_JAR_EXCLUDES := jdk/test/lib/containers
57+ endif
58+
5559$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
5660 TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
5761 SRC := $(TEST_LIB_SOURCE_DIR), \
58- EXCLUDES := jdk/test/lib/containers jdk/test/lib/security , \
62+ EXCLUDES := $(BUILD_TEST_LIB_JAR_EXCLUDES) , \
5963 BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
6064 HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
6165 JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
@@ -64,6 +68,10 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
6468 --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
6569 --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
6670 --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
71+ --add-exports java.base/jdk.internal.platform=ALL-UNNAMED \
72+ --add-exports java.base/sun.security.pkcs=ALL-UNNAMED \
73+ --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
74+ --add-exports java.base/sun.security.x509=ALL-UNNAMED \
6775 --enable-preview, \
6876))
6977
0 commit comments