make/lib/Lib-java.instrument.gmk

*** 28,63 ****
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
  
  ################################################################################
  
- LIBINSTRUMENT_SRC := $(TOPDIR)/src/java.instrument/share/native/libinstrument \
-     $(TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
-     #
- LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
-     $(addprefix -I, $(LIBINSTRUMENT_SRC)) \
-     -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
-     -I$(TOPDIR)/src/java.base/share/native/libjli \
-     -I$(TOPDIR)/src/java.base/share/native/libjava \
-     #
- 
  ifeq ($(OPENJDK_TARGET_OS), windows)
    # Statically link the C runtime so that there are not dependencies on modules
    # not on the search patch when invoked from the Windows system directory
    # (or elsewhere).
!   LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
    # equivalent of strcasecmp is stricmp on Windows
!   LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
      NAME := instrument, \
-     SRC := $(LIBINSTRUMENT_SRC), \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
      CFLAGS_debug := -DJPLIS_LOGGING, \
      CFLAGS_release := -DNO_JPLIS_LOGGING, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN) \
          $(LIBINSTRUMENT_LDFLAGS), \
      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \
          -L$(call FindLibDirForModule, java.base)/jli, \
--- 28,55 ----
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    # Statically link the C runtime so that there are not dependencies on modules
    # not on the search patch when invoked from the Windows system directory
    # (or elsewhere).
!   LIBINSTRUMENT_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB))
    # equivalent of strcasecmp is stricmp on Windows
!   LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp
! else
!   LIBINSTRUMENT_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
      NAME := instrument, \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(LIBINSTRUMENT_CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
      CFLAGS_debug := -DJPLIS_LOGGING, \
      CFLAGS_release := -DNO_JPLIS_LOGGING, \
+     EXTRA_HEADER_DIRS := java.base:libjli, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN) \
          $(LIBINSTRUMENT_LDFLAGS), \
      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \
          -L$(call FindLibDirForModule, java.base)/jli, \