Register layered AWT JNI access before analysis

Author: thomaswue

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java

@@ -47,6 +47,7 @@
 @AutomaticallyRegisteredFeature
 public class JNIRegistrationAWTSupport extends JNIRegistrationUtil implements InternalFeature {
     private ResolvedJavaMethod systemLoadMethod;
+    private boolean headlessJavaDesktopSupportRegistered;
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
@@ -56,16 +57,15 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         }
         if (isLinux() || isDarwin()) {
             JNIRegistrationSupport.singleton().addLibraryRegistrationHandler(this::registerHeadlessJavaDesktopSupport);
+            if (JNIRegistrationSupport.singleton().isPreviousLayerRegisteredLibrary("awt")) {
+                registerHeadlessJavaDesktopSupport("awt");
+            }
         }
     }
 
     @Override
     public void afterAnalysis(AfterAnalysisAccess access) {
         JNIRegistrationSupport jniRegistrationSupport = JNIRegistrationSupport.singleton();
-        if ((isLinux() || isDarwin()) && jniRegistrationSupport.isPreviousLayerRegisteredLibrary("awt") &&
-                        !jniRegistrationSupport.isCurrentLayerRegisteredLibrary("awt")) {
-            registerHeadlessJavaDesktopSupport("awt");
-        }
         if (jniRegistrationSupport.isAnyLayerRegisteredLibrary("awt")) {
             jniRegistrationSupport.addJvmShimExports(
                             "JVM_IsStaticallyLinked");
@@ -166,9 +166,10 @@ private static void registerDarwinBuiltinPkgNatives() {
     }
 
     private void registerHeadlessJavaDesktopSupport(String libname) {
-        if (!"awt".equals(libname)) {
+        if (!"awt".equals(libname) || headlessJavaDesktopSupportRegistered) {
             return;
         }
+        headlessJavaDesktopSupportRegistered = true;
         JVMCIRuntimeJNIAccess.register(systemLoadMethod);
         if (isDarwin()) {
             NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("awt");