mirror of
https://gitlab.futo.org/keyboard/latinime.git
synced 2024-09-28 14:54:30 +01:00
Update LatinIME native Makefile for gesture code
Also, a small clean up in the proguard.flags file Change-Id: I860034c51a2abf448f7ecc250ed35687b1f1dd82
This commit is contained in:
parent
4847a27f74
commit
8fcd7694ae
@ -3,10 +3,6 @@
|
|||||||
<init>(...);
|
<init>(...);
|
||||||
}
|
}
|
||||||
|
|
||||||
-keep class com.android.inputmethod.latin.Flag {
|
|
||||||
*;
|
|
||||||
}
|
|
||||||
|
|
||||||
-keep class com.android.inputmethod.keyboard.ProximityInfo {
|
-keep class com.android.inputmethod.keyboard.ProximityInfo {
|
||||||
<init>(com.android.inputmethod.keyboard.ProximityInfo);
|
<init>(com.android.inputmethod.keyboard.ProximityInfo);
|
||||||
}
|
}
|
||||||
|
@ -24,11 +24,10 @@ FLAG_DO_PROFILE ?= false
|
|||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LATIN_IME_SRC_DIR := src
|
LATIN_IME_SRC_DIR := src
|
||||||
|
LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
|
LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) \
|
||||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)/gesture
|
$(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/, gesture gesture/impl)
|
||||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)/gesture/impl
|
|
||||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)/gesture/impl/header
|
|
||||||
|
|
||||||
LOCAL_CFLAGS += -Werror -Wall
|
LOCAL_CFLAGS += -Werror -Wall
|
||||||
|
|
||||||
@ -51,11 +50,7 @@ LATIN_IME_CORE_SRC_FILES := \
|
|||||||
proximity_info.cpp \
|
proximity_info.cpp \
|
||||||
proximity_info_state.cpp \
|
proximity_info_state.cpp \
|
||||||
unigram_dictionary.cpp \
|
unigram_dictionary.cpp \
|
||||||
gesture/build_check.cpp \
|
gesture/build_check.cpp
|
||||||
gesture/impl/gesture_decoder_impl.cpp \
|
|
||||||
gesture/impl/incremental_decoder_impl.cpp \
|
|
||||||
gesture/impl/token_beam_impl.cpp \
|
|
||||||
gesture/impl/token_impl.cpp
|
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(LATIN_IME_JNI_SRC_FILES) \
|
$(LATIN_IME_JNI_SRC_FILES) \
|
||||||
@ -81,12 +76,50 @@ LOCAL_C_INCLUDES += external/stlport/stlport bionic
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
######################################
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) \
|
||||||
|
$(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/, gesture gesture/impl gesture/impl/header)
|
||||||
|
|
||||||
|
LOCAL_CFLAGS += -Werror -Wall
|
||||||
|
|
||||||
|
# To suppress compiler warnings for unused variables/functions used for debug features etc.
|
||||||
|
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
|
||||||
|
|
||||||
|
LATIN_IME_GESTURE_IMPL_SRC_FILES := \
|
||||||
|
gesture/impl/gesture_decoder_impl.cpp \
|
||||||
|
gesture/impl/incremental_decoder_impl.cpp \
|
||||||
|
gesture/impl/token_beam_impl.cpp \
|
||||||
|
gesture/impl/token_impl.cpp
|
||||||
|
|
||||||
|
LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_GESTURE_IMPL_SRC_FILES))
|
||||||
|
|
||||||
|
ifeq ($(FLAG_DO_PROFILE), true)
|
||||||
|
$(warning Making profiling version of native library)
|
||||||
|
LOCAL_CFLAGS += -DFLAG_DO_PROFILE
|
||||||
|
else # FLAG_DO_PROFILE
|
||||||
|
ifeq ($(FLAG_DBG), true)
|
||||||
|
$(warning Making debug version of native library)
|
||||||
|
LOCAL_CFLAGS += -DFLAG_DBG
|
||||||
|
endif # FLAG_DBG
|
||||||
|
endif # FLAG_DO_PROFILE
|
||||||
|
|
||||||
|
LOCAL_MODULE := libjni_latinime_gesture_impl_static
|
||||||
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
|
||||||
|
include external/stlport/libstlport.mk
|
||||||
|
else # In the NDK build system
|
||||||
|
LOCAL_C_INCLUDES += external/stlport/stlport bionic
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
######################################
|
######################################
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
|
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_static
|
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_static libjni_latinime_gesture_impl_static
|
||||||
|
|
||||||
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
|
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
|
||||||
LOCAL_SHARED_LIBRARIES := libstlport
|
LOCAL_SHARED_LIBRARIES := libstlport
|
||||||
@ -116,5 +149,6 @@ include $(BUILD_SHARED_LIBRARY)
|
|||||||
#################### Clean up the tmp vars
|
#################### Clean up the tmp vars
|
||||||
LATIN_IME_CORE_SRC_FILES :=
|
LATIN_IME_CORE_SRC_FILES :=
|
||||||
LATIN_IME_JNI_SRC_FILES :=
|
LATIN_IME_JNI_SRC_FILES :=
|
||||||
|
LATIN_IME_GESTURE_IMPL_SRC_FILES :=
|
||||||
LATIN_IME_SRC_DIR :=
|
LATIN_IME_SRC_DIR :=
|
||||||
TARGETING_UNBUNDLED_FROYO :=
|
LATIN_IME_SRC_FULLPATH_DIR :=
|
||||||
|
Loading…
Reference in New Issue
Block a user