make/lib/Lib-java.instrument.gmk
branchihse-jdk-library-branch
changeset 56454 82c3ae69914f
parent 56433 c3cf838aa2da
child 56488 a6cb200daa5d
--- a/make/lib/Lib-java.instrument.gmk	Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/Lib-java.instrument.gmk	Wed Apr 18 14:22:53 2018 +0200
@@ -48,9 +48,8 @@
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
     HEADER_FLAGS := \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
-        -I$(TOPDIR)/src/java.base/share/native/libjli \
-        -I$(TOPDIR)/src/java.base/share/native/libjava, \
+        -I$(call FindHeaderDirForModule, $(MODULE)) \
+        $(addprefix -I, $(call FindSrcDirsForLib, java.base, jli)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \