Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d42b38 authored by Dhananjay Kumar's avatar Dhananjay Kumar Committed by Gerrit - the friendly Code Review server
Browse files

audio: correct dependencies for compilation with AOSP flag 

Add liblog to the dependency list for voice_processing and
disable compilation of audiod when AOSP flag is set.

Change-Id: Ie60559806a3ee02e6b84626ba2a3ee89844a1a7a
parent 973fc364

Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -14,9 +14,12 @@ include $(MY_LOCAL_PATH)/voice_processing/Android.mk 
include $(MY_LOCAL_PATH)/mm-audio/Android.mk

include $(MY_LOCAL_PATH)/policy_hal/Android.mk

include $(MY_LOCAL_PATH)/visualizer/Android.mk

include $(MY_LOCAL_PATH)/audiod/Android.mk

include $(MY_LOCAL_PATH)/post_proc/Android.mk

include $(MY_LOCAL_PATH)/qahw_api/Android.mk

endif



ifneq ($(TARGET_USES_AOSP), true)

include $(MY_LOCAL_PATH)/audiod/Android.mk

endif



endif

hal/msm8916/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -3594,10 +3594,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                    (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                     snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC;

                }

                else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

                else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                         (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                         snd_device = SND_DEVICE_IN_UNPROCESSED_THREE_MIC;

               } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

               } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                         (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                         snd_device = SND_DEVICE_IN_UNPROCESSED_QUAD_MIC;

               } else {
@@ -3623,10 +3623,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                       (channel_mask == AUDIO_CHANNEL_IN_STEREO)) &&

                       (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_STEREO;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                       (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                snd_device = SND_DEVICE_IN_THREE_MIC;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                       (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                snd_device = SND_DEVICE_IN_QUAD_MIC;

            }
@@ -3643,10 +3643,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                (channel_mask == AUDIO_CHANNEL_IN_STEREO)) &&

                (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                snd_device = SND_DEVICE_IN_UNPROCESSED_THREE_MIC;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                       (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                snd_device = SND_DEVICE_IN_UNPROCESSED_QUAD_MIC;

            } else {

hal/msm8974/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -3221,10 +3221,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                    (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                    snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC;

                }

                else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

                else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                         (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                         snd_device = SND_DEVICE_IN_UNPROCESSED_THREE_MIC;

               } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

               } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                          (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                          snd_device = SND_DEVICE_IN_UNPROCESSED_QUAD_MIC;

               } else {
@@ -3250,10 +3250,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                       (channel_mask == AUDIO_CHANNEL_IN_STEREO)) &&

                       (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                snd_device = SND_DEVICE_IN_VOICE_REC_DMIC_STEREO;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                       (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                snd_device = SND_DEVICE_IN_THREE_MIC;

            } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

            } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                       (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                snd_device = SND_DEVICE_IN_QUAD_MIC;

            }
@@ -3270,10 +3270,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                 (channel_mask == AUDIO_CHANNEL_IN_STEREO)) &&

                 (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

                 snd_device = SND_DEVICE_IN_UNPROCESSED_STEREO_MIC;

             } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_3) &&

             } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_3) &&

                 (my_data->source_mic_type & SOURCE_THREE_MIC)) {

                 snd_device = SND_DEVICE_IN_UNPROCESSED_THREE_MIC;

             } else if (((int)channel_mask == AUDIO_CHANNEL_INDEX_MASK_4) &&

             } else if (((int)channel_mask == (int)AUDIO_CHANNEL_INDEX_MASK_4) &&

                 (my_data->source_mic_type & SOURCE_QUAD_MIC)) {

                 snd_device = SND_DEVICE_IN_UNPROCESSED_QUAD_MIC;

             } else {

voice_processing/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ LOCAL_C_INCLUDES += \ 
    $(call include-path-for, audio-effects)



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils



LOCAL_SHARED_LIBRARIES += libdl