summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-10-12 17:11:43 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2011-10-12 17:50:07 +0530
commit2f7289ca073ff4ee478997447fc9a104b1497fcd (patch)
tree52fee0263184dfac9498551b0afae60f601d6335
parent79167a44bef2aa696923ac264f54f3a24516e022 (diff)
downloadpandaboard-2f7289ca073ff4ee478997447fc9a104b1497fcd.tar.gz
audio: cleanup of logs and added Android.mk
Cleanup of logs and added Android.mk at the root to check the build for pandaboard Change-Id: Ia5d4d41a5f6431cf6a28311b4754ad7fd35565dc Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--Android.mk5
-rw-r--r--modules/Android.mk2
-rw-r--r--modules/alsa/Android.mk2
-rw-r--r--modules/alsa/alsa_omap4.cpp3
4 files changed, 9 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..0e5a93f
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,5 @@
+# make sure its omap4 stuff
+ifeq ($(TARGET_BOARD_PLATFORM),omap4)
+include $(call first-makefiles-under,$(call my-dir))
+endif
+
diff --git a/modules/Android.mk b/modules/Android.mk
new file mode 100644
index 0000000..10f3367
--- /dev/null
+++ b/modules/Android.mk
@@ -0,0 +1,2 @@
+include $(call first-makefiles-under,$(call my-dir))
+
diff --git a/modules/alsa/Android.mk b/modules/alsa/Android.mk
index 76a1aef..3a54d9f 100644
--- a/modules/alsa/Android.mk
+++ b/modules/alsa/Android.mk
@@ -27,7 +27,7 @@ LOCAL_SHARED_LIBRARIES := \
libasound \
liblog
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
LOCAL_MODULE:= alsa.omap4
include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/alsa/alsa_omap4.cpp b/modules/alsa/alsa_omap4.cpp
index 3d987d4..329b9ec 100644
--- a/modules/alsa/alsa_omap4.cpp
+++ b/modules/alsa/alsa_omap4.cpp
@@ -518,13 +518,12 @@ static status_t s_route(alsa_handle_t *handle, uint32_t devices, int mode)
static void setAlsaControls(alsa_handle_t *handle, uint32_t devices, int mode)
{
- LOGD("***************%s: devices %08x mode %d", __FUNCTION__, devices, mode);
+ LOGD("%s: devices %08x mode %d", __FUNCTION__, devices, mode);
ALSAControl control("hw:00");
/* check whether the devices is input or not */
/* for output devices */
if (devices & 0x0000FFFF)
{
- LOGD("*********%s: devices %08x mode %d", __FUNCTION__, devices, mode);
control.set("DL1 Mixer Multimedia",1);
control.set("DL1 Media Playback Volume",118);
control.set("Sidetone Mixer Playback",1);