commit 303f51dd95debe951d820e2bd70c32fd4e64e720
author Shiv Maliyappanahalli <smaliyap@codeaurora.org> Fri Oct 25 16:24:27 2013 -0700
committer Shiv Maliyappanahalli <smaliyap@codeaurora.org> Mon Oct 28 16:29:12 2013 -0700
tree 7de7e1ac55aaac3379f409bc5f9a1f1741bfaf7c
parent f3b9a42020a389b5c2619844841a9b7fb5e973be

hal: compile voice extensions based on board config flag

Compile voice extensions based on the flag
AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS defined
in BoardConfigVendor.mk.

Change-Id: I06c42bf4b79294fed2077c1d2771ed155f68de00

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index be67ba0..9e9be9e 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -6,12 +6,6 @@
 
 LOCAL_ARM_MODE := arm
 
-#MULTI_VOICE_SESSION_ENABLED := true
-
-ifdef MULTI_VOICE_SESSION_ENABLED
-LOCAL_CFLAGS += -DMULTI_VOICE_SESSION_ENABLED
-endif
-
 AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
 ifneq ($(filter msm8974 msm8226 msm8610 apq8084,$(TARGET_BOARD_PLATFORM)),)
   # B-family platform uses msm8974 code base
@@ -29,10 +23,6 @@
 	voice.c \
 	$(AUDIO_PLATFORM)/platform.c
 
-ifdef MULTI_VOICE_SESSION_ENABLED
-LOCAL_SRC_FILES += voice_extn/voice_extn.c
-endif
-
 LOCAL_SRC_FILES += audio_extn/audio_extn.c
 
 ifneq ($(strip $(AUDIO_FEATURE_DISABLED_ANC_HEADSET)),true)
@@ -43,10 +33,6 @@
     LOCAL_CFLAGS += -DAFE_PROXY_ENABLED
 endif
 
-ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true)
-LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
-endif
-
 ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FM)),true)
     LOCAL_CFLAGS += -DFM_ENABLED
     LOCAL_SRC_FILES += audio_extn/fm.c
@@ -63,6 +49,18 @@
     LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/surround_sound/
 endif
 
+ifneq ($(strip $(AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS)),true)
+    LOCAL_CFLAGS += -DMULTI_VOICE_SESSION_ENABLED
+    LOCAL_SRC_FILES += voice_extn/voice_extn.c
+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/voice_extn
+    LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+
+ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true)
+    LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
+endif
+
+endif
+
 LOCAL_SHARED_LIBRARIES := \
 	liblog \
 	libcutils \
@@ -79,10 +77,6 @@
 	$(LOCAL_PATH)/$(AUDIO_PLATFORM) \
 	$(LOCAL_PATH)/audio_extn
 
-ifdef MULTI_VOICE_SESSION_ENABLED
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-endif
-
 LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw

hal/voice_extn/voice_extn.h

diff --git a/hal/voice_extn/voice_extn.h b/hal/voice_extn/voice_extn.h
index a8efef1..dd2dfd8 100644
--- a/hal/voice_extn/voice_extn.h
+++ b/hal/voice_extn/voice_extn.h
@@ -67,7 +67,7 @@
 }
 #endif
 
-#if defined INCALL_MUSIC_ENABLED && defined MULTI_VOICE_SESSION_ENABLED
+#ifdef INCALL_MUSIC_ENABLED
 int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev,
                                                   struct stream_out *out);
 #else