Android: fix logcat support building in AOSP.

Building failed this way:

log.c:51:51: error: use of undeclared identifier fmt
        __android_log_vprint(ANDROID_LOG_FATAL, PACKAGE, fmt, aq);
                                                         ^
log.c:79:51: error: use of undeclared identifier fmt
        __android_log_vprint(ANDROID_LOG_ERROR, PACKAGE, fmt, aq);
                                                         ^
log.c:105:50: error: use of undeclared identifier fmt
        __android_log_vprint(ANDROID_LOG_WARN, PACKAGE, fmt, aq);
                                                        ^

diff --git a/Android.mk b/Android.mk
index b6fd7d5..b4074aa 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -41,6 +41,9 @@ libexfat_src_files := \
 
 libexfat_headers := $(LOCAL_PATH)/libexfat
 
+libexfat_shared_libraries := \
+    liblog
+
 ## TARGET ##
 include $(CLEAR_VARS)
 
@@ -49,6 +52,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(libexfat_src_files)
 LOCAL_CFLAGS := $(exfat_common_cflags)
 LOCAL_C_INCLUDES := $(libexfat_headers)
+LOCAL_SHARED_LIBRARIES := $(libexfat_shared_libraries)
 
 include $(BUILD_STATIC_LIBRARY)
 

diff --git a/libexfat/log.c b/libexfat/log.c
index 45e6403..f29f74b 100644 (file)
--- a/libexfat/log.c
+++ b/libexfat/log.c
@@ -48,7 +48,7 @@ void exfat_bug(const char* format, ...)
        fputs(".\n", stderr);
 
 #ifdef __ANDROID__
-       __android_log_vprint(ANDROID_LOG_FATAL, PACKAGE, fmt, aq);
+       __android_log_vprint(ANDROID_LOG_FATAL, PACKAGE, format, aq);
 #else
        if (!isatty(STDERR_FILENO))
                vsyslog(LOG_CRIT, format, aq);
@@ -76,7 +76,7 @@ void exfat_error(const char* format, ...)
        fputs(".\n", stderr);
 
 #ifdef __ANDROID__
-       __android_log_vprint(ANDROID_LOG_ERROR, PACKAGE, fmt, aq);
+       __android_log_vprint(ANDROID_LOG_ERROR, PACKAGE, format, aq);
 #else
        if (!isatty(STDERR_FILENO))
                vsyslog(LOG_ERR, format, aq);
@@ -102,7 +102,7 @@ void exfat_warn(const char* format, ...)
        fputs(".\n", stderr);
 
 #ifdef __ANDROID__
-       __android_log_vprint(ANDROID_LOG_WARN, PACKAGE, fmt, aq);
+       __android_log_vprint(ANDROID_LOG_WARN, PACKAGE, format, aq);
 #else
        if (!isatty(STDERR_FILENO))
                vsyslog(LOG_WARNING, format, aq);