make/test/BuildTestLib.gmk

*** 50,28 ***
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
      BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
      JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
      DISABLED_WARNINGS := deprecation removal preview, \
-     JAVAC_FLAGS := --enable-preview, \
  ))
  
  TARGETS += $(BUILD_WB_JAR)
  
  $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SRC := $(TEST_LIB_SOURCE_DIR), \
!     EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
      BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
      HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
      JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
!     DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview restricted dangling-doc-comments, \
      JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
          --enable-preview, \
  ))
  
  TARGETS += $(BUILD_TEST_LIB_JAR)
  
--- 50,33 ---
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
      BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
      JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
      DISABLED_WARNINGS := deprecation removal preview, \
  ))
  
  TARGETS += $(BUILD_WB_JAR)
  
  $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SRC := $(TEST_LIB_SOURCE_DIR), \
!     EXCLUDES := jdk/test/lib/containers jdk/test/lib/security org, \
      BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
      HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
      JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
!     DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview restricted varargs dangling-doc-comments, \
      JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+         --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
          --enable-preview, \
  ))
  
  TARGETS += $(BUILD_TEST_LIB_JAR)