svm/libcontainer: move jni*.h into the right directories

oracle · Jun 4, 2024 · 2342b27 · 2342b27
1 parent 529450d
commit 2342b27
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -867,6 +867,8 @@
                                    # e.g., '__cxa_pure_virtual'. -O1 or higher avoids the problem.
                                    # "-DASSERT", "-DPRINT_WARNINGS", "-g", "-O1", "-DLOG_LEVEL=6",
                                    # include dirs
+                                   "-I<path:com.oracle.svm.native.libcontainer>/src/java.base/share/native",
+                                   "-I<path:com.oracle.svm.native.libcontainer>/src/java.base/unix/native",
                                    "-I<path:com.oracle.svm.native.libcontainer>/src/hotspot",
                                    "-I<path:com.oracle.svm.native.libcontainer>/src/hotspot/share",
                                    "-I<path:com.oracle.svm.native.libcontainer>/src/hotspot/os/linux",

diff --git a/substratevm/src/com.oracle.svm.native.libcontainer/ninja.template b/substratevm/src/com.oracle.svm.native.libcontainer/ninja.template
@@ -25,8 +25,8 @@
 root = .
 builddir = build
 
-includes                  = -Isrc/hotspot -Isrc/hotspot/share -Isrc/svm -Isrc/svm/share
-includes_linux            = $includes -Isrc/hotspot/os/linux -Isrc/hotspot/os/posix -Isrc/hotspot/os/posix/include
+includes                  = -Isrc/hotspot -Isrc/hotspot/share -Isrc/svm -Isrc/svm/share -Isrc/java.base/share/native
+includes_linux            = $includes -Isrc/hotspot/os/linux -Isrc/hotspot/os/posix -Isrc/hotspot/os/posix/include -Isrc/java.base/unix/native
 defines_linux             = -DNATIVE_IMAGE -DLINUX -DINCLUDE_SUFFIX_COMPILER=_gcc -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
 
 cflags_linux              = $defines_linux -std=c++14 $includes_linux -fno-rtti -fno-exceptions -fvisibility=hidden -fPIC

diff --git a/...svm.native.libcontainer/src/hotspot/jni.h → ...ontainer/src/java.base/share/native/jni.h b/...svm.native.libcontainer/src/hotspot/jni.h → ...ontainer/src/java.base/share/native/jni.h
diff --git a/....native.libcontainer/src/hotspot/jni_md.h → ...tainer/src/java.base/unix/native/jni_md.h b/....native.libcontainer/src/hotspot/jni_md.h → ...tainer/src/java.base/unix/native/jni_md.h