--- a/make/lib/Lib-jdk.jdwp.agent.gmk Thu May 03 14:46:44 2018 +0200
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk Thu May 03 23:33:28 2018 +0200
@@ -33,8 +33,8 @@
CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
$(LIBDT_SOCKET_CPPFLAGS), \
EXTRA_HEADER_DIRS := \
- $(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
- $(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export, \
+ $(call FindSrcDirsForComponent, $(MODULE), include) \
+ $(call FindSrcDirsForComponent, $(MODULE), libjdwp/export), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_linux := -lpthread, \
@@ -55,8 +55,8 @@
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
EXTRA_HEADER_DIRS := \
- $(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
- $(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export, \
+ $(call FindSrcDirsForComponent, $(MODULE), include) \
+ $(call FindSrcDirsForComponent, $(MODULE), libjdwp/export), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(JDKLIB_LIBS), \