From f3ac4360231c37ec7b210356d43dc8892419c4d6 Mon Sep 17 00:00:00 2001
From: Roman <gr.rPman@gmail.com>
Date: Sat, 24 Dec 2016 04:15:41 +0700
Subject: [PATCH] small fixes to make android jni library on desktop

---
 SConstruct                                       |  2 +-
 src/android/RHVoice-core/src/main/jni/SConscript | 13 +++++++++++++
 src/android/RHVoice-core/src/main/jni/native.cpp |  2 +-
 src/jni                                          |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/android/RHVoice-core/src/main/jni/SConscript
 create mode 120000 src/jni

diff --git a/SConstruct b/SConstruct
index 645c3c04c..48f6b90a5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -217,7 +217,7 @@ def configure(env):
     if env["PLATFORM"]=="win32":
         env.AppendUnique(LIBS="kernel32")
     conf.Finish()
-    src_subdirs=["third-party","core","lib","utils"]
+    src_subdirs=["third-party","core","lib","utils","jni"]
     if env["audio_libs"]:
         src_subdirs.append("audio")
         src_subdirs.append("test")
diff --git a/src/android/RHVoice-core/src/main/jni/SConscript b/src/android/RHVoice-core/src/main/jni/SConscript
new file mode 100644
index 000000000..794a558cd
--- /dev/null
+++ b/src/android/RHVoice-core/src/main/jni/SConscript
@@ -0,0 +1,13 @@
+import os.path
+
+Import("env","libRHVoice_core")
+local_env=env.Clone()
+local_env["CPPPATH"].append("/usr/lib/jvm/jdk1.8.0_60/include")
+local_env["CPPPATH"].append("/usr/lib/jvm/jdk1.8.0_60/include/linux")
+local_env["libversion"]="1.0.0"
+local_env["liblevel"]=2
+local_env.Prepend(LIBS=libRHVoice_core)
+src=["native.cpp"]
+native=local_env.BuildLibrary("jni",src)
+if env["PLATFORM"]!="win32":
+    local_env.InstallLibrary(native)
diff --git a/src/android/RHVoice-core/src/main/jni/native.cpp b/src/android/RHVoice-core/src/main/jni/native.cpp
index 035a528e6..1c6324917 100644
--- a/src/android/RHVoice-core/src/main/jni/native.cpp
+++ b/src/android/RHVoice-core/src/main/jni/native.cpp
@@ -432,7 +432,7 @@ JNIEXPORT void JNICALL Java_com_github_olga_1yakovleva_rhvoice_TTSEngine_onInit
           params.resource_paths.push_back(jstring_to_string(env,static_cast<jstring>(jstr)));
         }
     }
-  params.logger=smart_ptr<event_logger>(new java_logger_wrapper(env,logger));
+  //params.logger=smart_ptr<event_logger>(new java_logger_wrapper(env,logger));
   data->engine_ptr=engine::create(params);
   if(data->engine_ptr->get_voices().empty())
     throw no_voices();
diff --git a/src/jni b/src/jni
new file mode 120000
index 000000000..03129370c
--- /dev/null
+++ b/src/jni
@@ -0,0 +1 @@
+android/RHVoice-core/src/main/jni
\ No newline at end of file