make/lib/Lib-java.desktop.gmk

rev 54095 : 8259343: [macOS] Update JNI error handling in Cocoa code.
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

*** 94,117 ****
        DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
            deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
            -framework Security \
            -framework ExceptionHandling \
-           -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
            -framework IOSurface \
            -framework QuartzCore, \
    ))
  
    TARGETS += $(BUILD_LIBOSXAPP)
  
    ##############################################################################
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
--- 94,119 ----
        DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
            deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
+           -ljava \
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
            -framework Security \
            -framework ExceptionHandling \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
            -framework IOSurface \
            -framework QuartzCore, \
    ))
  
+   $(BUILD_LIBOSXAPP): $(call FindLib, java.base, java)
+ 
    TARGETS += $(BUILD_LIBOSXAPP)
  
    ##############################################################################
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
*** 125,135 ****
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
            -losxapp \
            -framework Cocoa \
            -framework ApplicationServices \
-           -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework SystemConfiguration \
            $(JDKLIB_LIBS), \
    ))
  
--- 127,136 ----