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

Commit 0336ec4e authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Reorganize LatinIME native Makefile a bit more 

Change-Id: Iabb6caa620cb587110a3d88ce7129ed978eea83a
parent 83649cb4

native/jni/Android.mk

+16 −17
Original line number Diff line number Diff line
@@ -26,8 +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) \

    $(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/, gesture gesture/impl)

LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) $(LATIN_IME_SRC_FULLPATH_DIR)/gesture



LOCAL_CFLAGS += -Werror -Wall
@@ -52,16 +51,9 @@ LATIN_IME_CORE_SRC_FILES := \ 
    unigram_dictionary.cpp \

    gesture/incremental_decoder_interface.cpp



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 := \

    $(LATIN_IME_JNI_SRC_FILES) \

    $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES)) \

    $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_GESTURE_IMPL_SRC_FILES))

    $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))



ifeq ($(FLAG_DO_PROFILE), true)

    $(warning Making profiling version of native library)
@@ -73,7 +65,7 @@ ifeq ($(FLAG_DBG), true) 
endif # FLAG_DBG

endif # FLAG_DO_PROFILE



LOCAL_MODULE := libjni_latinime_static

LOCAL_MODULE := libjni_latinime_common_static

LOCAL_MODULE_TAGS := optional



ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
@@ -86,16 +78,21 @@ include $(BUILD_STATIC_LIBRARY) 
######################################

include $(CLEAR_VARS)



LOCAL_C_INCLUDES = $(LATIN_IME_SRC_FULLPATH_DIR) $(LATIN_IME_SRC_FULLPATH_DIR)/gesture

LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) \

    $(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/, gesture gesture/impl)



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



LOCAL_SRC_FILES := \

    $(LATIN_IME_JNI_SRC_FILES) \

    $(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES))

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)
@@ -107,7 +104,8 @@ ifeq ($(FLAG_DBG), true) 
endif # FLAG_DBG

endif # FLAG_DO_PROFILE



LOCAL_MODULE := libjni_latinime_common_static

# TODO: Can remove this static library from AOSP completely?

LOCAL_MODULE := libjni_latinime_gesture_impl_aosp_static

LOCAL_MODULE_TAGS := optional



ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
@@ -121,7 +119,8 @@ include $(BUILD_STATIC_LIBRARY) 
include $(CLEAR_VARS)



# 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_common_static libjni_latinime_gesture_impl_aosp_static



ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system

LOCAL_SHARED_LIBRARIES := libstlport