Update for Gingerbread build.

Add LOCAL_MODULE_TAGS as required.
Change LOG format to evade more restrictive errors by the compiler.

Change-Id: Ic5d390927c304f492b00ecd7d2ac2f2f68e79274

diff --git a/Android.mk b/Android.mk
index 411e045..6c56f63 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -86,6 +86,7 @@ endif
        libasound \
        liblog
 
+  LOCAL_MODULE_TAGS := optional
   LOCAL_MODULE:= alsa.default
 
   include $(BUILD_SHARED_LIBRARY)
@@ -106,6 +107,7 @@ endif
 
   LOCAL_SHARED_LIBRARIES := liblog
 
+  LOCAL_MODULE_TAGS := optional
   LOCAL_MODULE:= acoustics.default
 
   include $(BUILD_SHARED_LIBRARY)

diff --git a/AudioHardwareALSA.cpp b/AudioHardwareALSA.cpp
index b052a38..cecfb4a 100644 (file)
--- a/AudioHardwareALSA.cpp
+++ b/AudioHardwareALSA.cpp
@@ -63,7 +63,7 @@ static void ALSAErrorHandler(const char *file,
     l = snprintf(buf, BUFSIZ, "%s:%i:(%s) ", file, line, function);
     vsnprintf(buf + l, BUFSIZ - l, fmt, arg);
     buf[BUFSIZ-1] = '\0';
-    LOG(LOG_ERROR, "ALSALib", buf);
+    LOG(LOG_ERROR, "ALSALib", "%s", buf);
     va_end(arg);
 }