aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-06-02 22:38:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-02 22:38:21 -0700
commitb13b977ddd7bc1b6d811812cebbbf29c825db06c (patch)
tree0c62d36c4c7e77eefd1f5a42a3b5fa14c5346a30
parent67942c485017840631ee5694814402aceccc426c (diff)
parentd18112046af044d1a13d5399087e14a0d230cfed (diff)
downloadlatinime-b13b977ddd7bc1b6d811812cebbbf29c825db06c.tar.gz
latinime-b13b977ddd7bc1b6d811812cebbbf29c825db06c.tar.xz
latinime-b13b977ddd7bc1b6d811812cebbbf29c825db06c.zip
am d1811204: Move bigram_dictionary
* commit 'd18112046af044d1a13d5399087e14a0d230cfed': Move bigram_dictionary
-rw-r--r--native/jni/Android.mk2
-rw-r--r--native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp (renamed from native/jni/src/bigram_dictionary.cpp)0
-rw-r--r--native/jni/src/suggest/core/dictionary/bigram_dictionary.h (renamed from native/jni/src/bigram_dictionary.h)0
-rw-r--r--native/jni/src/suggest/core/dictionary/dictionary.cpp2
4 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index f56223f74..1518dad17 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -46,7 +46,6 @@ LATIN_IME_JNI_SRC_FILES := \
jni_common.cpp
LATIN_IME_CORE_SRC_FILES := \
- bigram_dictionary.cpp \
correction.cpp \
dic_traverse_wrapper.cpp \
unigram_dictionary.cpp \
@@ -57,6 +56,7 @@ LATIN_IME_CORE_SRC_FILES := \
dic_node_utils.cpp \
dic_nodes_cache.cpp) \
$(addprefix suggest/core/dictionary/, \
+ bigram_dictionary.cpp \
binary_dictionary_format.cpp \
byte_array_utils.cpp \
dictionary.cpp \
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp
index 59d1b19b6..59d1b19b6 100644
--- a/native/jni/src/bigram_dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp
diff --git a/native/jni/src/bigram_dictionary.h b/native/jni/src/suggest/core/dictionary/bigram_dictionary.h
index 8b7a253a2..8b7a253a2 100644
--- a/native/jni/src/bigram_dictionary.h
+++ b/native/jni/src/suggest/core/dictionary/bigram_dictionary.h
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index dcb83cb51..6fd755dfe 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -21,9 +21,9 @@
#include <map> // TODO: remove
#include <stdint.h>
-#include "bigram_dictionary.h"
#include "defines.h"
#include "dic_traverse_wrapper.h"
+#include "suggest/core/dictionary/bigram_dictionary.h"
#include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/suggest.h"
#include "suggest/core/suggest_options.h"