aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/jni_common.cpp
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-12-13 08:33:57 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-13 08:33:57 -0800
commit3ac00d1889f7752bec6a653842a1fc2f079ab911 (patch)
treefc8c92ee41a00075830a6363bfeafe85aa8cbc0b /native/jni/jni_common.cpp
parent379a7e88efaff2af42313faddac86fbdfb5881d1 (diff)
parenta245d15da5d295af21ead9a01583c64796a31ad7 (diff)
downloadlatinime-3ac00d1889f7752bec6a653842a1fc2f079ab911.tar.gz
latinime-3ac00d1889f7752bec6a653842a1fc2f079ab911.tar.xz
latinime-3ac00d1889f7752bec6a653842a1fc2f079ab911.zip
am a245d15d: Have dicttool use the native library to generate v4 dicts.
* commit 'a245d15da5d295af21ead9a01583c64796a31ad7': Have dicttool use the native library to generate v4 dicts.
Diffstat (limited to 'native/jni/jni_common.cpp')
-rw-r--r--native/jni/jni_common.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index 3a8f4362d..f2867d7c3 100644
--- a/native/jni/jni_common.cpp
+++ b/native/jni/jni_common.cpp
@@ -18,12 +18,9 @@
#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_Ver3DictDecoder.h"
#include "defines.h"
/*
@@ -41,7 +38,6 @@ 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;
@@ -54,11 +50,6 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
AKLOGE("ERROR: ProximityInfo native registration failed");
return -1;
}
-#endif
- if (!latinime::register_Ver3DictDecoder(env)) {
- AKLOGE("ERROR: Ver3DictDecoder native registration failed");
- return -1;
- }
/* success -- return valid version number */
return JNI_VERSION_1_6;
}