Use the JDK system dependency for hsejni

onlyone0001 · Sep 8, 2021 · 6841ae8 · 6841ae8
1 parent 1cf7170
commit 6841ae8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/hsejni/meson.build b/hsejni/meson.build
@@ -1,5 +1,7 @@
 add_languages('java', native: false)
 
+jdk_dep = dependency('jdk', version : '>=1.8.0')
+
 subdir('include')
 subdir('java')
 subdir('src')

diff --git a/hsejni/src/meson.build b/hsejni/src/meson.build
@@ -3,13 +3,6 @@ hsejni_sources = files(
     'hsejni.c',
 )
 
-java_home = run_command(
-    'sh',
-    '-c',
-    'dirname $(dirname $(readlink -f $(which javac)))',
-    check: true,
-).stdout().strip()
-
 hsejni_c_args = [
     '-DCOMPNAME="hsejni"',
 ]
@@ -23,14 +16,11 @@ hsejni = library(
         util_includes,
         hsejni_includes,
         component_root_includes,
-        include_directories(
-            '@0@'.format(java_home) / 'include',
-            '@0@'.format(java_home) / 'include' / 'linux'
-        ),
     ],
     dependencies: [
         hse_dep,
         thread_dep,
+        jdk_dep,
         libhse_cli_dep,
     ],
     version: meson.project_version(),