alsa_sound: enable csd-client for fusion3 voice call
Change-Id: Ibefe43d9dc669af74c88b8f4054af7ca5ce2caac
diff --git a/alsa_sound/Android.mk b/alsa_sound/Android.mk
index 38c3a5c..b3ef6ec 100644
--- a/alsa_sound/Android.mk
+++ b/alsa_sound/Android.mk
@@ -11,6 +11,7 @@
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS := -D_POSIX_SOURCE
+LOCAL_CFLAGS += -DQCOM_CSDCLIENT_ENABLED
LOCAL_SRC_FILES := \
AudioHardwareALSA.cpp \
@@ -26,18 +27,21 @@
libaudiopolicy_legacy \
LOCAL_SHARED_LIBRARIES := \
+ libacdbloader \
libcutils \
libutils \
libmedia \
libhardware \
libc \
libpower \
- libalsa-intf
+ libalsa-intf \
+ libcsd-client
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audcal
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-acdb-util
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/libalsa-intf
+LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-qmi/csd-client
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/surround_sound/
LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_C_INCLUDES += hardware/libhardware_legacy/include
@@ -109,6 +113,7 @@
endif
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/libalsa-intf
+LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-qmi/csd-client
LOCAL_SRC_FILES:= \
alsa_default.cpp \
@@ -117,11 +122,11 @@
LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
- libalsa-intf
+ libalsa-intf \
+ libcsd-client
LOCAL_MODULE:= alsa.msm8960
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
-
endif
diff --git a/alsa_sound/AudioHardwareALSA.h b/alsa_sound/AudioHardwareALSA.h
index 9cc22d7..0dcc672 100644
--- a/alsa_sound/AudioHardwareALSA.h
+++ b/alsa_sound/AudioHardwareALSA.h
@@ -19,6 +19,8 @@
#ifndef ANDROID_AUDIO_HARDWARE_ALSA_H
#define ANDROID_AUDIO_HARDWARE_ALSA_H
+#define QCOM_CSDCLIENT_ENABLED 1
+
#include <utils/List.h>
#include <hardware_legacy/AudioHardwareBase.h>
diff --git a/alsa_sound/AudioStreamInALSA.cpp b/alsa_sound/AudioStreamInALSA.cpp
index ed05e68..72e399b 100644
--- a/alsa_sound/AudioStreamInALSA.cpp
+++ b/alsa_sound/AudioStreamInALSA.cpp
@@ -170,7 +170,7 @@
sizeof(mHandle->useCase));
}
}
-#ifdef QCOM_CSDCLIENT_ENABLED
+#ifdef QCOM_FM_ENABLED
} else if(mHandle->devices == AudioSystem::DEVICE_IN_FM_RX) {
strlcpy(mHandle->useCase, SND_USE_CASE_MOD_CAPTURE_FM, sizeof(mHandle->useCase));
} else if (mHandle->devices == AudioSystem::DEVICE_IN_FM_RX_A2DP) {