summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McNeil <sean.mcneil@windriver.com>2011-03-04 10:44:24 +0700
committerSean McNeil <sean.mcneil@windriver.com>2011-03-04 10:44:24 +0700
commitece3f1b6f1e6a67d02e42490eca6c7de62220b57 (patch)
treedae2073f4487378ff28cd0b792c707ab1f677a9e
parent68a5d4f36e98119d656fa8a76e4944e44ba72678 (diff)
downloadalsa_sound-ece3f1b6f1e6a67d02e42490eca6c7de62220b57.tar.gz
Update for Gingerbread build.
Add LOCAL_MODULE_TAGS as required. Change LOG format to evade more restrictive errors by the compiler. Change-Id: Ic5d390927c304f492b00ecd7d2ac2f2f68e79274
-rw-r--r--Android.mk2
-rw-r--r--AudioHardwareALSA.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 411e045..6c56f63 100644
--- 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
--- 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);
}