diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-05-30 05:21:55 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 05:21:55 -0700 |
| commit | 4647c4c78efef4d096c11b1a2424ef49813d6ded (patch) | |
| tree | 1e8b2d5a33d1513346270c464c320efc02e37852 | |
| parent | 9a28541e05abdb0d4a603274faaab9cc815581b2 (diff) | |
| parent | 424a173db8cd4dfd7b5a986310ec2d815a4eb171 (diff) | |
| download | latinime-4647c4c78efef4d096c11b1a2424ef49813d6ded.tar.gz latinime-4647c4c78efef4d096c11b1a2424ef49813d6ded.tar.xz latinime-4647c4c78efef4d096c11b1a2424ef49813d6ded.zip | |
am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
* commit '424a173db8cd4dfd7b5a986310ec2d815a4eb171':
Move additional_proximity_chars to the layout directory
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/layout/additional_proximity_chars.cpp (renamed from native/jni/src/additional_proximity_chars.cpp) | 2 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/layout/additional_proximity_chars.h (renamed from native/jni/src/additional_proximity_chars.h) | 0 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/layout/proximity_info.cpp | 2 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/layout/proximity_info_utils.h | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 6c3c41a6c..ea35dab18 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 := \ - additional_proximity_chars.cpp \ bigram_dictionary.cpp \ char_utils.cpp \ correction.cpp \ @@ -61,6 +60,7 @@ LATIN_IME_CORE_SRC_FILES := \ dic_node_utils.cpp \ dic_nodes_cache.cpp) \ $(addprefix suggest/core/layout/, \ + additional_proximity_chars.cpp \ proximity_info.cpp \ proximity_info_params.cpp \ proximity_info_state.cpp \ diff --git a/native/jni/src/additional_proximity_chars.cpp b/native/jni/src/suggest/core/layout/additional_proximity_chars.cpp index 661c50e91..34b8b37b0 100644 --- a/native/jni/src/additional_proximity_chars.cpp +++ b/native/jni/src/suggest/core/layout/additional_proximity_chars.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "additional_proximity_chars.h" +#include "suggest/core/layout/additional_proximity_chars.h" namespace latinime { // TODO: Stop using hardcoded additional proximity characters. diff --git a/native/jni/src/additional_proximity_chars.h b/native/jni/src/suggest/core/layout/additional_proximity_chars.h index a88fd6cea..a88fd6cea 100644 --- a/native/jni/src/additional_proximity_chars.h +++ b/native/jni/src/suggest/core/layout/additional_proximity_chars.h diff --git a/native/jni/src/suggest/core/layout/proximity_info.cpp b/native/jni/src/suggest/core/layout/proximity_info.cpp index d5ef2d8c8..995e10455 100644 --- a/native/jni/src/suggest/core/layout/proximity_info.cpp +++ b/native/jni/src/suggest/core/layout/proximity_info.cpp @@ -21,10 +21,10 @@ #define LOG_TAG "LatinIME: proximity_info.cpp" -#include "additional_proximity_chars.h" #include "char_utils.h" #include "defines.h" #include "jni.h" +#include "suggest/core/layout/additional_proximity_chars.h" #include "suggest/core/layout/geometry_utils.h" #include "suggest/core/layout/proximity_info_params.h" diff --git a/native/jni/src/suggest/core/layout/proximity_info_utils.h b/native/jni/src/suggest/core/layout/proximity_info_utils.h index 2204fd979..c3a275b3c 100644 --- a/native/jni/src/suggest/core/layout/proximity_info_utils.h +++ b/native/jni/src/suggest/core/layout/proximity_info_utils.h @@ -19,10 +19,10 @@ #include <cmath> -#include "additional_proximity_chars.h" #include "char_utils.h" #include "defines.h" #include "hash_map_compat.h" +#include "suggest/core/layout/additional_proximity_chars.h" #include "suggest/core/layout/geometry_utils.h" namespace latinime { |