Move methods for Shortcut reading to policyimpl.

Bug: 6669677
Change-Id: If0a565de015564f803429f4fbf21b05687f80553

native/jni/Android.mk

@@ -56,7 +56,6 @@ LATIN_IME_CORE_SRC_FILES := \
         binary_dictionary_format_utils.cpp \
         binary_dictionary_header.cpp \
         binary_dictionary_header_reading_utils.cpp \
-        binary_dictionary_terminal_attributes_reading_utils.cpp \
         bloom_filter.cpp \
         byte_array_utils.cpp \
         dictionary.cpp \
@@ -72,6 +71,7 @@ LATIN_IME_CORE_SRC_FILES := \
     suggest/core/session/dic_traverse_session.cpp \
     $(addprefix suggest/policyimpl/dictionary/, \
         bigram/bigram_list_reading_utils.cpp \
+        shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp \
         dictionary_structure_with_buffer_policy_factory.cpp \
         dynamic_patricia_trie_node_reader.cpp \
         dynamic_patricia_trie_policy.cpp \

native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-#include "suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h"
+#include \
+    "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h"
 
 #include "suggest/core/dictionary/byte_array_utils.h"
 

native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h

@@ -21,8 +21,8 @@
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
-// TODO: Move shortcuts reading methods to policyimpl.
-#include "suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h"
+#include \
+    "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h"
 
 namespace latinime {