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