From 2e43b7e82d30b99e6b170a2b0a0f660d0c923102 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 24 Apr 2017 16:37:31 +0200
Subject: [PATCH] Update kiwix-lib to new kiwix-android way of building.

`kiwix-android` is using `kiwix-lib` as an external java application now.
So we need `kiwix-lib` build system to also install application files
(manifest, resources, ..).
---
 src/android/AndroidManifest.xml    | 13 +++++++++++++
 src/android/meson.build            |  4 ++++
 src/android/res/values/strings.xml |  3 +++
 src/meson.build                    |  7 ++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 src/android/AndroidManifest.xml
 create mode 100644 src/android/res/values/strings.xml

diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
new file mode 100644
index 000000000..1181dc199
--- /dev/null
+++ b/src/android/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+  package="kiwix.org.kiwixlib"
+>
+
+  <application android:allowBackup="true"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+  >
+
+  </application>
+
+</manifest>
diff --git a/src/android/meson.build b/src/android/meson.build
index b221f9299..bb9bc8861 100644
--- a/src/android/meson.build
+++ b/src/android/meson.build
@@ -11,3 +11,7 @@ kiwix_jni = custom_target('jni',
 )
 
 kiwix_sources += ['android/kiwix.cpp', kiwix_jni]
+
+install_subdir('org', install_dir: 'kiwix-lib/java')
+install_subdir('res', install_dir: 'kiwix-lib')
+install_data('AndroidManifest.xml', install_dir: 'kiwix-lib')
diff --git a/src/android/res/values/strings.xml b/src/android/res/values/strings.xml
new file mode 100644
index 000000000..8386572c7
--- /dev/null
+++ b/src/android/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">Kiwix Lib</string>
+</resources>
diff --git a/src/meson.build b/src/meson.build
index 5cbac1f57..c6e4e3f1c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -14,8 +14,12 @@ kiwix_sources += lib_resources
 
 if get_option('android')
   subdir('android')
+  install_dir = 'kiwix-lib/jniLibs/' + host_machine.cpu_family()
+else
+  install_dir = get_option('libdir')
 endif
 
+
 if has_ctpp2_dep
   kiwix_sources += ['ctpp2/CTPP2VMStringLoader.cpp']
 endif
@@ -30,4 +34,5 @@ kiwixlib = library('kiwix',
                    include_directories : inc,
                    dependencies : all_deps,
                    version: '1.0.0',
-                   install : true)
+                   install: true,
+                   install_dir: install_dir)