make/lib/Lib-jdk.jdwp.agent.gmk

*** 25,49 ****
  
  include LibCommon.gmk
  
  ################################################################################
  
- LIBDT_SOCKET_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \
-     $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_socket
- LIBDT_SOCKET_CPPFLAGS := \
-     $(addprefix -I, $(LIBDT_SOCKET_SRC)) \
-     -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-     -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-     -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
-     #
- 
  $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
      NAME := dt_socket, \
-     SRC := $(LIBDT_SOCKET_SRC), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
          $(LIBDT_SOCKET_CPPFLAGS), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS_linux := -lpthread, \
      LIBS_solaris := -lnsl -lsocket, \
      LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
--- 25,42 ----
  
  include LibCommon.gmk
  
  ################################################################################
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
      NAME := dt_socket, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
          $(LIBDT_SOCKET_CPPFLAGS), \
+     EXTRA_HEADER_DIRS := \
+         include \
+         libjdwp/export, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS_linux := -lpthread, \
      LIBS_solaris := -lnsl -lsocket, \
      LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
*** 54,78 ****
  # Include socket transport with JDWP agent to allow for remote debugging
  TARGETS += $(BUILD_LIBDT_SOCKET)
  
  ################################################################################
  
- LIBJDWP_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-     $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libjdwp
- LIBJDWP_CPPFLAGS := \
-     -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-     -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
-     $(addprefix -I, $(LIBJDWP_SRC))
- 
  # JDWP_LOGGING causes log messages to be compiled into the library.
  $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
      NAME := jdwp, \
-     SRC := $(LIBJDWP_SRC), \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
!         $(LIBJDWP_CPPFLAGS) \
!         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_linux := $(LIBDL), \
      LIBS_solaris := $(LIBDL), \
--- 47,64 ----
  # Include socket transport with JDWP agent to allow for remote debugging
  TARGETS += $(BUILD_LIBDT_SOCKET)
  
  ################################################################################
  
  # JDWP_LOGGING causes log messages to be compiled into the library.
  $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
      NAME := jdwp, \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
!     EXTRA_HEADER_DIRS := \
!       include \
!       libjdwp/export, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_linux := $(LIBDL), \
      LIBS_solaris := $(LIBDL), \