make/lib/Lib-jdk.net.gmk

@@ -24,26 +24,25 @@
 #
 
 include LibCommon.gmk
 
 ################################################################################
-
 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
       NAME := extnet, \
-      SRC := $(TOPDIR)/src/jdk.net/$(OPENJDK_TARGET_OS)/native/libextnet, \
+      SRC := $(TOPDIR)/src/jdk.net/linux/native/libextnet, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
+      CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net \
+            -I$(TOPDIR)/src/java.base/share/native/libnet -I$(TOPDIR)/src/java.base/unix/native/libnet -I$(TOPDIR)/src/java.base/share/native/libnio/ch -I$(TOPDIR)/src/java.base/unix/native/libnio/ch \
+            $(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(call FindSrcDirsForLib, java.base, net, nio)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := -ljava, \
-      LIBS_solaris := -lsocket, \
-      LIBS_linux := -ljvm, \
+      LIBS := -lc -ljava -lnet -lnio -lpthread -ljvm -lrdmacm, \
+      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libextnet, \
   ))
 
   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
 
   TARGETS += $(BUILD_LIBEXTNET)
 endif
-
 ################################################################################