commit c2c1174e5d72eb16d9fd7756a02cd534c1d78977
author Ariel Gertzenstein <agertzen@google.com> Mon Nov 14 18:08:28 2016 -0500
committer Ariel Gertzenstein <agertzen@google.com> Tue Nov 15 13:53:09 2016 -0500
tree 5ba5696613ad39a0a1dabb5285db8d846e19e319
parent bb8f31f735c378bdf1d1482c0311e31d89eda0cc

Fix issues preventing building Angelfish on the wear-master branch.

Change-Id: Icbac6c0ed9e1dec7f73a9eafd7205f99f37db568

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index d25dd0a..ffbc071 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2177,7 +2177,7 @@
 
 #ifdef NO_AUDIO_OUT
 static ssize_t out_write_for_no_output(struct audio_stream_out *stream,
-                                       const void *buffer, size_t bytes)
+                                       const void *buffer __unused, size_t bytes)
 {
     struct stream_out *out = (struct stream_out *)stream;
 
@@ -2185,7 +2185,8 @@
      * Sleep for the amount of buffer duration
      */
     lock_output_stream(out);
-    usleep(bytes * 1000000 / audio_stream_out_frame_size(&out->stream.common) /
+    usleep(bytes * 1000000 / audio_stream_out_frame_size(
+            (const struct audio_stream_out *)&out->stream) /
             out_get_sample_rate(&out->stream.common));
     pthread_mutex_unlock(&out->lock);
     return bytes;

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index af05805..14809a9 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -968,7 +968,7 @@
             ALOGE("%s: Could not find the symbol acdb_loader_deallocate_ACDB from %s",
                   __func__, LIB_ACDB_LOADER);
 
-        my_data->acdb_send_audio_cal_v3 = (acdb_send_audio_cal_t)dlsym(my_data->acdb_handle,
+        my_data->acdb_send_audio_cal_v3 = (acdb_send_audio_cal_v3_t)dlsym(my_data->acdb_handle,
                                                     "acdb_loader_send_audio_cal_v3");
         if (!my_data->acdb_send_audio_cal_v3)
             ALOGE("%s: Could not find the symbol acdb_send_audio_cal from %s",
@@ -1094,7 +1094,7 @@
 
 bool platform_check_and_set_capture_backend_cfg(struct audio_device* adev __unused,
                                               struct audio_usecase *usecase __unused,
-                                              snd_device_t snd_device)
+                                              snd_device_t snd_device __unused)
 {
     return false;
 }