make/test/JtregNativeJdk.gmk

rev 54093 : 8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m
8257860: [macOS]: Remove JNF dependency from libosxkrb5/SCDynamicStoreConfig.m
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

*** 1,7 ****
  #
! # Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 74,88 ****
    BUILD_JDK_JTREG_EXECUTABLES_LDFLAGS_exeJliLaunchTest := $(UNIX_LDFLAGS_JLI)
    BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
-   BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
    BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
!       -framework Cocoa -framework JavaNativeFoundation
  else
!   BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
  endif
  
  $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
      TYPE := LIBRARY, \
      SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
--- 74,90 ----
    BUILD_JDK_JTREG_EXECUTABLES_LDFLAGS_exeJliLaunchTest := $(UNIX_LDFLAGS_JLI)
    BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
!       -framework Cocoa
!   BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestDynamicStore := \
!       -framework Cocoa -framework SystemConfiguration
  else
!   BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.m
!   BUILD_JDK_JTREG_EXCLUDE += libTestDynamicStore.m
  endif
  
  $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
      TYPE := LIBRARY, \
      SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \