From 7c634738dd1d9337ee17315743998f750094dd25 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 20 Aug 2018 12:17:29 +0200
Subject: [PATCH] Update jni build script to java jdk 8+.

With jdk8, `javac` has an option `-h` to generate the header files of
native classes.
So there is no need to run `javah` several times.

As there is now only one command to run (`javac`), there is no need for
the wrapper script `gen_kiwix.sh`.

Fix #167
---
 src/android/gen_kiwix.sh | 16 ----------------
 src/android/meson.build  |  4 +---
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100755 src/android/gen_kiwix.sh

diff --git a/src/android/gen_kiwix.sh b/src/android/gen_kiwix.sh
deleted file mode 100755
index 9140ae010..000000000
--- a/src/android/gen_kiwix.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-BUILD_PATH=$(pwd)
-
-echo "javac -d $BUILD_PATH/src/android $@"
-javac -d $BUILD_PATH/src/android/ "$@"
-
-
-cd $BUILD_PATH/src/android
-echo "javah -jni org.kiwix.kiwixlib"
-javah -jni org.kiwix.kiwixlib.JNIKiwix
-javah -jni org.kiwix.kiwixlib.JNIKiwixReader
-javah -jni org.kiwix.kiwixlib.JNIKiwixSearcher
-cd $BUILD_PATH
diff --git a/src/android/meson.build b/src/android/meson.build
index e79bf839f..d02fc25e3 100644
--- a/src/android/meson.build
+++ b/src/android/meson.build
@@ -1,6 +1,4 @@
 
-jni_generator = find_program('gen_kiwix.sh')
-
 kiwix_jni = custom_target('jni',
   input: ['org/kiwix/kiwixlib/JNIKiwix.java',
           'org/kiwix/kiwixlib/JNIKiwixReader.java',
@@ -14,7 +12,7 @@ kiwix_jni = custom_target('jni',
            'org_kiwix_kiwixlib_JNIKiwixReader.h',
            'org_kiwix_kiwixlib_JNIKiwixSearcher.h',
            'org_kiwix_kiwixlib_JNIKiwixSearcher_Result.h'],
-  command:[jni_generator, '@INPUT@']
+  command:['javac', '-d', '@OUTDIR@', '-h', '@OUTDIR@', '@INPUT@']
 )
 
 kiwix_sources += [