commit 22a9a3ecd6959cf6d46b4d04d9cd5a0b608d1249
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 29 18:49:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 18:49:38 2012 -0700
tree f7904cda914d00f53a8eecac0bf6715cd246c9ce
parent 3ef3e24a12ed72204f7a6f2e4b2df8ce7d243746
parent 989abb1295d6b20d54fcdc7a52c68144c821f576

Merge "Cleanup Slavic keyboard resources"

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index ffaede3..5fd9101 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -15,7 +15,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LATIN_IME_SRC_DIR := ../src
+LATIN_IME_SRC_DIR := src
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 

native/jni/src/additional_proximity_chars.cpp

diff --git a/native/src/additional_proximity_chars.cpp b/native/jni/src/additional_proximity_chars.cpp
similarity index 100%
rename from native/src/additional_proximity_chars.cpp
rename to native/jni/src/additional_proximity_chars.cpp

native/jni/src/additional_proximity_chars.h

diff --git a/native/src/additional_proximity_chars.h b/native/jni/src/additional_proximity_chars.h
similarity index 100%
rename from native/src/additional_proximity_chars.h
rename to native/jni/src/additional_proximity_chars.h

native/jni/src/basechars.cpp

diff --git a/native/src/basechars.cpp b/native/jni/src/basechars.cpp
similarity index 100%
rename from native/src/basechars.cpp
rename to native/jni/src/basechars.cpp

native/jni/src/bigram_dictionary.cpp

diff --git a/native/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp
similarity index 100%
rename from native/src/bigram_dictionary.cpp
rename to native/jni/src/bigram_dictionary.cpp

native/jni/src/bigram_dictionary.h

diff --git a/native/src/bigram_dictionary.h b/native/jni/src/bigram_dictionary.h
similarity index 100%
rename from native/src/bigram_dictionary.h
rename to native/jni/src/bigram_dictionary.h

native/jni/src/binary_format.h

diff --git a/native/src/binary_format.h b/native/jni/src/binary_format.h
similarity index 100%
rename from native/src/binary_format.h
rename to native/jni/src/binary_format.h

native/jni/src/char_utils.cpp

diff --git a/native/src/char_utils.cpp b/native/jni/src/char_utils.cpp
similarity index 100%
rename from native/src/char_utils.cpp
rename to native/jni/src/char_utils.cpp

native/jni/src/char_utils.h

diff --git a/native/src/char_utils.h b/native/jni/src/char_utils.h
similarity index 100%
rename from native/src/char_utils.h
rename to native/jni/src/char_utils.h

native/jni/src/correction.cpp

diff --git a/native/src/correction.cpp b/native/jni/src/correction.cpp
similarity index 100%
rename from native/src/correction.cpp
rename to native/jni/src/correction.cpp

native/jni/src/correction.h

diff --git a/native/src/correction.h b/native/jni/src/correction.h
similarity index 100%
rename from native/src/correction.h
rename to native/jni/src/correction.h

native/jni/src/correction_state.h

diff --git a/native/src/correction_state.h b/native/jni/src/correction_state.h
similarity index 100%
rename from native/src/correction_state.h
rename to native/jni/src/correction_state.h

native/jni/src/debug.h

diff --git a/native/src/debug.h b/native/jni/src/debug.h
similarity index 100%
rename from native/src/debug.h
rename to native/jni/src/debug.h

native/jni/src/defines.h

diff --git a/native/src/defines.h b/native/jni/src/defines.h
similarity index 100%
rename from native/src/defines.h
rename to native/jni/src/defines.h

native/jni/src/dictionary.cpp

diff --git a/native/src/dictionary.cpp b/native/jni/src/dictionary.cpp
similarity index 100%
rename from native/src/dictionary.cpp
rename to native/jni/src/dictionary.cpp

native/jni/src/dictionary.h

diff --git a/native/src/dictionary.h b/native/jni/src/dictionary.h
similarity index 100%
rename from native/src/dictionary.h
rename to native/jni/src/dictionary.h

native/jni/src/proximity_info.cpp

diff --git a/native/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
similarity index 100%
rename from native/src/proximity_info.cpp
rename to native/jni/src/proximity_info.cpp

native/jni/src/proximity_info.h

diff --git a/native/src/proximity_info.h b/native/jni/src/proximity_info.h
similarity index 100%
rename from native/src/proximity_info.h
rename to native/jni/src/proximity_info.h

native/jni/src/terminal_attributes.h

diff --git a/native/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h
similarity index 100%
rename from native/src/terminal_attributes.h
rename to native/jni/src/terminal_attributes.h

native/jni/src/unigram_dictionary.cpp

diff --git a/native/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp
similarity index 100%
rename from native/src/unigram_dictionary.cpp
rename to native/jni/src/unigram_dictionary.cpp

native/jni/src/unigram_dictionary.h

diff --git a/native/src/unigram_dictionary.h b/native/jni/src/unigram_dictionary.h
similarity index 100%
rename from native/src/unigram_dictionary.h
rename to native/jni/src/unigram_dictionary.h

native/jni/src/words_priority_queue.h

diff --git a/native/src/words_priority_queue.h b/native/jni/src/words_priority_queue.h
similarity index 100%
rename from native/src/words_priority_queue.h
rename to native/jni/src/words_priority_queue.h

native/jni/src/words_priority_queue_pool.h

diff --git a/native/src/words_priority_queue_pool.h b/native/jni/src/words_priority_queue_pool.h
similarity index 100%
rename from native/src/words_priority_queue_pool.h
rename to native/jni/src/words_priority_queue_pool.h