am 424a173d: Merge "Move additional_proximity_chars to the layout directory"

* commit '424a173db8cd4dfd7b5a986310ec2d815a4eb171':
  Move additional_proximity_chars to the layout directory
main
Ken Wakasa 2013-05-30 05:21:55 -07:00 committed by Android Git Automerger
commit 4647c4c78e
5 changed files with 4 additions and 4 deletions

View File

@ -46,7 +46,6 @@ LATIN_IME_JNI_SRC_FILES := \
jni_common.cpp jni_common.cpp
LATIN_IME_CORE_SRC_FILES := \ LATIN_IME_CORE_SRC_FILES := \
additional_proximity_chars.cpp \
bigram_dictionary.cpp \ bigram_dictionary.cpp \
char_utils.cpp \ char_utils.cpp \
correction.cpp \ correction.cpp \
@ -61,6 +60,7 @@ LATIN_IME_CORE_SRC_FILES := \
dic_node_utils.cpp \ dic_node_utils.cpp \
dic_nodes_cache.cpp) \ dic_nodes_cache.cpp) \
$(addprefix suggest/core/layout/, \ $(addprefix suggest/core/layout/, \
additional_proximity_chars.cpp \
proximity_info.cpp \ proximity_info.cpp \
proximity_info_params.cpp \ proximity_info_params.cpp \
proximity_info_state.cpp \ proximity_info_state.cpp \

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "additional_proximity_chars.h" #include "suggest/core/layout/additional_proximity_chars.h"
namespace latinime { namespace latinime {
// TODO: Stop using hardcoded additional proximity characters. // TODO: Stop using hardcoded additional proximity characters.

View File

@ -21,10 +21,10 @@
#define LOG_TAG "LatinIME: proximity_info.cpp" #define LOG_TAG "LatinIME: proximity_info.cpp"
#include "additional_proximity_chars.h"
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "jni.h" #include "jni.h"
#include "suggest/core/layout/additional_proximity_chars.h"
#include "suggest/core/layout/geometry_utils.h" #include "suggest/core/layout/geometry_utils.h"
#include "suggest/core/layout/proximity_info_params.h" #include "suggest/core/layout/proximity_info_params.h"

View File

@ -19,10 +19,10 @@
#include <cmath> #include <cmath>
#include "additional_proximity_chars.h"
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "hash_map_compat.h" #include "hash_map_compat.h"
#include "suggest/core/layout/additional_proximity_chars.h"
#include "suggest/core/layout/geometry_utils.h" #include "suggest/core/layout/geometry_utils.h"
namespace latinime { namespace latinime {