From d18112046af044d1a13d5399087e14a0d230cfed Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Mon, 3 Jun 2013 13:06:32 +0900
Subject: [PATCH] Move bigram_dictionary

Change-Id: I2c243ac75bc02b912f6b0fabedd372148adf8076
---
 native/jni/Android.mk                                           | 2 +-
 .../jni/src/{ => suggest/core/dictionary}/bigram_dictionary.cpp | 0
 .../jni/src/{ => suggest/core/dictionary}/bigram_dictionary.h   | 0
 native/jni/src/suggest/core/dictionary/dictionary.cpp           | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename native/jni/src/{ => suggest/core/dictionary}/bigram_dictionary.cpp (100%)
 rename native/jni/src/{ => suggest/core/dictionary}/bigram_dictionary.h (100%)

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
similarity index 100%
rename from native/jni/src/bigram_dictionary.cpp
rename to 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
similarity index 100%
rename from native/jni/src/bigram_dictionary.h
rename to 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"