Rename JDK system dep to JNI

JNI is a more apt name because it currently only supports the JNI. I
also believe that CMake uses the terminology JNI here as well.

JNI is currently the only way to interact with the JVM through native
code, but there is a project called "Project Panama" which aims to be
another way for native code to interact with the JVM.

7 files changed, 0 insertions, 94 deletions

diff --git a/test cases/java/9 jdk/lib/com_mesonbuild_JdkTest.c b/test cases/java/9 jdk/lib/com_mesonbuild_JdkTest.c
deleted file mode 100644
index 075e37b2b..000000000
--- a/test cases/java/9 jdk/lib/com_mesonbuild_JdkTest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <jni.h>
-
-#include "com_mesonbuild_JdkTest.h"
-
-JNIEXPORT jint JNICALL Java_com_mesonbuild_JdkTest_jdk_1test
-  (JNIEnv *env, jclass clazz)
-{
-    return (jint)0xdeadbeef;
-}
diff --git a/test cases/java/9 jdk/lib/meson.build b/test cases/java/9 jdk/lib/meson.build
deleted file mode 100644
index 08407cf44..000000000
--- a/test cases/java/9 jdk/lib/meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
-sources = [
-  files(
-    'native.c',
-    'com_mesonbuild_JdkTest.c',
-  ),
-  native_headers
-]
-
-jdkjava = shared_module(
-  'jdkjava',
-  sources,
-  dependencies : [jdk],
-  include_directories : [native_header_includes]
-)
-
-jdkjava_dep = declare_dependency(
-  link_with : jdkjava,
-)
diff --git a/test cases/java/9 jdk/lib/native.c b/test cases/java/9 jdk/lib/native.c
deleted file mode 100644
index 0b5e71890..000000000
--- a/test cases/java/9 jdk/lib/native.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <jni.h>
-
-JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM *vm, void *reserved)
-{
-    return JNI_VERSION_1_8;
-}
-
-JNIEXPORT void JNICALL
-JNI_OnUnload(JavaVM *vm, void *reserved)
-{}
diff --git a/test cases/java/9 jdk/meson.build b/test cases/java/9 jdk/meson.build
deleted file mode 100644
index e5c9728f9..000000000
--- a/test cases/java/9 jdk/meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-project('jdkjava', ['c', 'java'])
-
-if build_machine.system() == 'cygwin'
-  error('MESON_SKIP_TEST: cygwin test failures')
-endif
-
-if build_machine.system() == 'windows' and build_machine.cpu_family() == 'x86'
-  error('MESON_SKIP_TEST: failing builds on 32bit Windows because a 32bit JDK isn not available in the Azure Pipelines Windows images')
-endif
-
-fs = import('fs')
-javamod = import('java')
-
-java = find_program('java')
-
-jdk = dependency('jdk', version : '>=1.8')
-
-# generate native headers
-subdir('src/com/mesonbuild')
-subdir('lib')
-subdir('src')
diff --git a/test cases/java/9 jdk/src/com/mesonbuild/JdkTest.java b/test cases/java/9 jdk/src/com/mesonbuild/JdkTest.java
deleted file mode 100644
index 35c47cef8..000000000
--- a/test cases/java/9 jdk/src/com/mesonbuild/JdkTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mesonbuild;
-
-public final class JdkTest {
-    private static native int jdk_test();
-
-    public static void main(String[] args) {
-        if (jdk_test() != 0xdeadbeef) {
-            throw new RuntimeException("jdk_test() did not return 0");
-        }
-    }
-
-    static {
-        System.loadLibrary("jdkjava");
-    }
-}
diff --git a/test cases/java/9 jdk/src/com/mesonbuild/meson.build b/test cases/java/9 jdk/src/com/mesonbuild/meson.build
deleted file mode 100644
index 0cce7f060..000000000
--- a/test cases/java/9 jdk/src/com/mesonbuild/meson.build
+++ /dev/null
@@ -1,3 +0,0 @@
-native_headers = javamod.generate_native_headers(
-  'JdkTest.java', package: 'com.mesonbuild', classes: ['JdkTest'])
-native_header_includes = include_directories('.')
diff --git a/test cases/java/9 jdk/src/meson.build b/test cases/java/9 jdk/src/meson.build
deleted file mode 100644
index d1b9ee31c..000000000
--- a/test cases/java/9 jdk/src/meson.build
+++ /dev/null
@@ -1,17 +0,0 @@
-jdkjar = jar(
-  'jdkjar',
-  'com' / 'mesonbuild' / 'JdkTest.java',
-  main_class : 'com.mesonbuild.JdkTest',
-)
-
-test(
-  'jdktest',
-  java,
-  args: [
-    '-Djava.library.path=@0@'.format(fs.parent(jdkjava.full_path())),
-    '-jar',
-    jdkjar,
-  ],
-  protocol : 'exitcode',
-  depends : [jdkjava],
-)