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

Commit e3f26dd2 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Fix native debug log 

Change-Id: If19f808522a5a35fa06c2825fcd0d92e6e4a0631
parent 42e7a1e5

native/jni/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
LOCAL_PATH := $(call my-dir)



############ some local flags

# If you change any of those flags, you need to rebuild both libjni_latinime_static

# and the shared library.

# If you change any of those flags, you need to rebuild both libjni_latinime_common_static

# and the shared library that uses libjni_latinime_common_static.

FLAG_DBG ?= false

FLAG_DO_PROFILE ?= false
@@ -82,11 +82,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_common_static 


ifeq ($(FLAG_DO_PROFILE), true)

    $(warning Making profiling version of native library)

    LOCAL_SHARED_LIBRARIES += libcutils libutils

    LOCAL_SHARED_LIBRARIES += liblog

else # FLAG_DO_PROFILE

ifeq ($(FLAG_DBG), true)

    $(warning Making debug version of native library)

    LOCAL_SHARED_LIBRARIES += libcutils libutils

    LOCAL_SHARED_LIBRARIES += liblog

endif # FLAG_DBG

endif # FLAG_DO_PROFILE

native/jni/src/defines.h

+6 −8
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ 
#define LATINIME_DEFINES_H



#if defined(FLAG_DO_PROFILE) || defined(FLAG_DBG)

#include <cutils/log.h>

#define AKLOGE ALOGE

#define AKLOGI ALOGI

#include <android/log.h>

#ifndef LOG_TAG

#define LOG_TAG "LatinIME: "

#endif

#define AKLOGE(fmt, ...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, fmt, ##__VA_ARGS__)

#define AKLOGI(fmt, ...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, fmt, ##__VA_ARGS__)



#define DUMP_WORD(word, length) do { dumpWord(word, length); } while(0)

#define DUMP_WORD_INT(word, length) do { dumpWordInt(word, length); } while(0)
@@ -116,10 +119,6 @@ static inline void prof_out(void) { 
#endif // FLAG_DO_PROFILE



#ifdef FLAG_DBG

#include <cutils/log.h>

#ifndef LOG_TAG

#define LOG_TAG "LatinIME: "

#endif

#define DEBUG_DICT true

#define DEBUG_DICT_FULL false

#define DEBUG_EDIT_DISTANCE false
@@ -146,7 +145,6 @@ static inline void prof_out(void) { 
#define DEBUG_CORRECTION_FREQ false

#define DEBUG_WORDS_PRIORITY_QUEUE false





#endif // FLAG_DBG



#ifndef U_SHORT_MAX