diff options
| author |   satok <satok@google.com> | 2012-08-12 18:32:43 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-12 18:32:43 -0700 |
| commit | 078a0028d68557853ba3a8f6c254ec4b7907bec2 (patch) | |
| tree | 2869a3c51eaa5ea7fa359c5f3cd4552ee4c288e9 /java | |
| parent | 0da03fdfbe675c5e6041d70290d47c0428555ab6 (diff) | |
| parent | f9b2841fb592778ad34b5181e1c0bcbf551e3632 (diff) | |
| download | latinime-078a0028d68557853ba3a8f6c254ec4b7907bec2.tar.gz latinime-078a0028d68557853ba3a8f6c254ec4b7907bec2.tar.xz latinime-078a0028d68557853ba3a8f6c254ec4b7907bec2.zip | |
am f9b2841f: am 81451030: Merge "Fix JNI" into jb-mr1-dev
* commit 'f9b2841fb592778ad34b5181e1c0bcbf551e3632':
Fix JNI
Diffstat (limited to 'java')
| -rw-r--r-- | java/proguard.flags | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionary.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DicTraverseSession.java | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/java/proguard.flags b/java/proguard.flags index 24b4c1987..ac5b7df16 100644 --- a/java/proguard.flags +++ b/java/proguard.flags @@ -44,6 +44,10 @@ <init>(...); } +-keepclasseswithmembernames class * { + native <methods>; +} + -keep class com.android.inputmethod.research.ResearchLogger { void flush(); void publishCurrentLogUnit(...); diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 9b85fb65a..f0f5cd320 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -79,6 +79,7 @@ public class BinaryDictionary extends Dictionary { mUseFullEditDistance = useFullEditDistance; loadDictionary(filename, offset, length); mDicTraverseSession = new DicTraverseSession(locale); + mDicTraverseSession.initSession(mNativeDict); } static { diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java index 4c3654213..c76815363 100644 --- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java +++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java @@ -23,8 +23,8 @@ public class DicTraverseSession { JniUtils.loadNativeLibrary(); } private native long setDicTraverseSessionNative(String locale); - //private native void initDicTraverseSessionNative(long nativeDicTraverseSession, - //long dictionary, int[] previousWord, int previousWordLength); + private native void initDicTraverseSessionNative(long nativeDicTraverseSession, + long dictionary, int[] previousWord, int previousWordLength); private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession); private long mNativeDicTraverseSession; @@ -43,8 +43,8 @@ public class DicTraverseSession { } public void initSession(long dictionary, int[] previousWord, int previousWordLength) { - //initDicTraverseSessionNative( - //mNativeDicTraverseSession, dictionary, previousWord, previousWordLength); + initDicTraverseSessionNative( + mNativeDicTraverseSession, dictionary, previousWord, previousWordLength); } private final long createNativeDicTraverseSession(String locale) { |