Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff730a66 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am bc2fd24f: am b68e7344: Cleanup the include paths 

* commit 'bc2fd24f':
  Cleanup the include paths
parents c7e1caac bc2fd24f

native/jni/Android.mk

+12 −15
Original line number Diff line number Diff line
@@ -26,12 +26,7 @@ include $(CLEAR_VARS) 
LATIN_IME_SRC_DIR := src

LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)



LOCAL_C_INCLUDES += \

    $(LATIN_IME_SRC_FULLPATH_DIR) \

    $(LATIN_IME_SRC_FULLPATH_DIR)/suggest \

    $(LATIN_IME_SRC_FULLPATH_DIR)/suggest/core \

    $(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/suggest/core/, dicnode dictionary policy session) \

    $(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/suggest/policyimpl/, gesture typing)

LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR)



LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \

    -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers
@@ -65,18 +60,20 @@ LATIN_IME_CORE_SRC_FILES := \ 
    proximity_info_state_utils.cpp \

    unigram_dictionary.cpp \

    words_priority_queue.cpp \

    suggest/core/dicnode/dic_node.cpp \

    suggest/core/dicnode/dic_nodes_cache.cpp \

    suggest/core/dicnode/dic_node_utils.cpp \

    $(addprefix suggest/core/dicnode/, \

        dic_node.cpp \

        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    suggest/core/suggest.cpp \

    suggest/core/policy/weighting.cpp \

    suggest/core/session/dic_traverse_session.cpp \

    suggest/core/suggest.cpp \

    suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \

    suggest/policyimpl/typing/scoring_params.cpp \

    suggest/policyimpl/typing/typing_scoring.cpp \

    suggest/policyimpl/typing/typing_suggest_policy.cpp \

    suggest/policyimpl/typing/typing_traversal.cpp \

    suggest/policyimpl/typing/typing_weighting.cpp

    $(addprefix suggest/policyimpl/typing/, \

        scoring_params.cpp \

        typing_scoring.cpp \

        typing_suggest_policy.cpp \

        typing_traversal.cpp \

        typing_weighting.cpp)



LOCAL_SRC_FILES := \

    $(LATIN_IME_JNI_SRC_FILES) \

native/jni/jni_common.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


#define LOG_TAG "LatinIME: jni"



#include "jni_common.h"



#include "com_android_inputmethod_keyboard_ProximityInfo.h"

#include "com_android_inputmethod_latin_BinaryDictionary.h"

#include "com_android_inputmethod_latin_DicTraverseSession.h"

#include "defines.h"

#include "jni.h"

#include "jni_common.h"



/*

 * Returns the JNI version on success, -1 on failure.

native/jni/src/dictionary.cpp

+5 −4
Original line number Diff line number Diff line
@@ -16,17 +16,18 @@ 


#define LOG_TAG "LatinIME: dictionary.cpp"



#include "dictionary.h"



#include <map> // TODO: remove

#include <stdint.h>



#include "bigram_dictionary.h"

#include "binary_format.h"

#include "defines.h"

#include "dictionary.h"

#include "dic_traverse_wrapper.h"

#include "gesture_suggest_policy_factory.h"

#include "suggest.h"

#include "typing_suggest_policy_factory.h"

#include "suggest/core/suggest.h"

#include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h"

#include "suggest/policyimpl/typing/typing_suggest_policy_factory.h"

#include "unigram_dictionary.h"



namespace latinime {

native/jni/src/suggest/core/dictionary/shortcut_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define LATINIME_SHORTCUT_UTILS



#include "defines.h"

#include "dic_node_utils.h"

#include "suggest/core/dicnode/dic_node_utils.h"

#include "terminal_attributes.h"



namespace latinime {

native/jni/src/suggest/core/policy/traversal.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#include "defines.h"



namespace latinime {



class DicTraverseSession;



class Traversal {

 public:

    virtual int getMaxPointerCount() const = 0;