changeset 49676:6c3054543ede

8199636: Unify naming for jaas_unix and jaas_nt Reviewed-by: erikj
author ihse
date Thu, 15 Mar 2018 01:32:03 +0100
parents 995a5556edfa
children be5eab692a2f
files make/lib/Lib-jdk.security.auth.gmk src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
diffstat 3 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/Lib-jdk.security.auth.gmk	Thu Mar 15 01:20:47 2018 +0100
+++ b/make/lib/Lib-jdk.security.auth.gmk	Thu Mar 15 01:32:03 2018 +0100
@@ -33,13 +33,8 @@
   LIBJAAS_MAPFILE := $(TOPDIR)/make/mapfiles/libjaas/mapfile-vers
 endif
 
-LIBJAAS_NAME := jaas_unix
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBJAAS_NAME := jaas_nt
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
-    NAME := $(LIBJAAS_NAME), \
+    NAME := jaas, \
     SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java	Thu Mar 15 01:20:47 2018 +0100
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java	Thu Mar 15 01:32:03 2018 +0100
@@ -128,6 +128,6 @@
 
 
     private void loadNative() {
-        System.loadLibrary("jaas_nt");
+        System.loadLibrary("jaas");
     }
 }
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java	Thu Mar 15 01:20:47 2018 +0100
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java	Thu Mar 15 01:32:03 2018 +0100
@@ -43,7 +43,7 @@
      * the native library to access the underlying system information.
      */
     public UnixSystem() {
-        System.loadLibrary("jaas_unix");
+        System.loadLibrary("jaas");
         getUnixInfo();
     }