commit a5d42b38dd217b6b3cd725de45b670d3be152653
author Dhananjay Kumar <dhakumar@codeaurora.org> Wed Jan 11 21:22:16 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jan 23 22:39:10 2017 -0800
tree 8ec7dc4a3fcc99251a28dd4ae31bb0ee229c13f7
parent 973fc364610f8e9031274247f077c2024a4f7b0f

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

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index fd8c773..4c7a8de 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3221,10 +3221,10 @@
                     (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 @@
                        (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 @@
                  (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 {