aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/jni_common.cpp
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-08-15 02:03:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-15 02:03:07 -0700
commitf180c9a250d9d5a96b4fdadc1aed6d2c5961d920 (patch)
tree2b892f9b0366ef89de34fbc735d9ee8cc35c3ad4 /native/jni/jni_common.cpp
parent8ad360228532643fbbbbce0b614db4f80753d9d9 (diff)
parente7870a2c0d817e6548eb00c80278b9f7b86c1a5b (diff)
downloadlatinime-f180c9a250d9d5a96b4fdadc1aed6d2c5961d920.tar.gz
latinime-f180c9a250d9d5a96b4fdadc1aed6d2c5961d920.tar.xz
latinime-f180c9a250d9d5a96b4fdadc1aed6d2c5961d920.zip
am e7870a2c: Add an initial JNI interface to dicttool.
* commit 'e7870a2c0d817e6548eb00c80278b9f7b86c1a5b': Add an initial JNI interface to dicttool.
Diffstat (limited to 'native/jni/jni_common.cpp')
-rw-r--r--native/jni/jni_common.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index f2867d7c3..733e15f73 100644
--- a/native/jni/jni_common.cpp
+++ b/native/jni/jni_common.cpp
@@ -18,9 +18,12 @@
#include "jni_common.h"
+#ifndef HOST_TOOL
#include "com_android_inputmethod_keyboard_ProximityInfo.h"
#include "com_android_inputmethod_latin_BinaryDictionary.h"
#include "com_android_inputmethod_latin_DicTraverseSession.h"
+#endif
+#include "com_android_inputmethod_latin_makedict_BinaryDictInputOutput.h"
#include "defines.h"
/*
@@ -38,6 +41,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
AKLOGE("ERROR: JNIEnv is invalid");
return -1;
}
+#ifndef HOST_TOOL
if (!latinime::register_BinaryDictionary(env)) {
AKLOGE("ERROR: BinaryDictionary native registration failed");
return -1;
@@ -50,6 +54,11 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
AKLOGE("ERROR: ProximityInfo native registration failed");
return -1;
}
+#endif
+ if (!latinime::register_BinaryDictInputOutput(env)) {
+ AKLOGE("ERROR: BinaryDictInputOutput native registration failed");
+ return -1;
+ }
/* success -- return valid version number */
return JNI_VERSION_1_6;
}