nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am e3f26dd2: Fix native debug log 

* commit 'e3f26dd21e16a7d8c23a95a5084947e54ba598e1':
  Fix native debug log
main
Ken Wakasa 2012-07-27 05:20:35 -07:00 committed by Android Git Automerger
parent c3a4a3e189 e3f26dd21e
commit 0cea6fdbde
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/Android.mk
View File

@ -15,8 +15,8 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
############ some local flags ############ some local flags
# If you change any of those flags, you need to rebuild both libjni_latinime_static # If you change any of those flags, you need to rebuild both libjni_latinime_common_static
# and the shared library. # and the shared library that uses libjni_latinime_common_static.
FLAG_DBG ?= false FLAG_DBG ?= false
FLAG_DO_PROFILE ?= false FLAG_DO_PROFILE ?= false
@ -82,11 +82,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_common_static
ifeq ($(FLAG_DO_PROFILE), true) ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library) $(warning Making profiling version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils LOCAL_SHARED_LIBRARIES += liblog
else # FLAG_DO_PROFILE else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true) ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library) $(warning Making debug version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils LOCAL_SHARED_LIBRARIES += liblog
endif # FLAG_DBG endif # FLAG_DBG
endif # FLAG_DO_PROFILE endif # FLAG_DO_PROFILE

14
native/jni/src/defines.h
View File

@ -19,9 +19,12 @@
#define LATINIME_DEFINES_H #define LATINIME_DEFINES_H
#if defined(FLAG_DO_PROFILE) || defined(FLAG_DBG) #if defined(FLAG_DO_PROFILE) || defined(FLAG_DBG)
#include <cutils/log.h> #include <android/log.h>
#define AKLOGE ALOGE #ifndef LOG_TAG
#define AKLOGI ALOGI #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(word, length) do { dumpWord(word, length); } while(0)
#define DUMP_WORD_INT(word, length) do { dumpWordInt(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 #endif // FLAG_DO_PROFILE
#ifdef FLAG_DBG #ifdef FLAG_DBG
#include <cutils/log.h>
#ifndef LOG_TAG
#define LOG_TAG "LatinIME: "
#endif
#define DEBUG_DICT true #define DEBUG_DICT true
#define DEBUG_DICT_FULL false #define DEBUG_DICT_FULL false
#define DEBUG_EDIT_DISTANCE false #define DEBUG_EDIT_DISTANCE false
@ -146,7 +145,6 @@ static inline void prof_out(void) {
#define DEBUG_CORRECTION_FREQ false #define DEBUG_CORRECTION_FREQ false
#define DEBUG_WORDS_PRIORITY_QUEUE false #define DEBUG_WORDS_PRIORITY_QUEUE false
#endif // FLAG_DBG #endif // FLAG_DBG
#ifndef U_SHORT_MAX #ifndef U_SHORT_MAX