summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-06-27 07:30:27 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-27 07:30:27 +0000
commitf56133888e0abbd3941d41a101b4f4078510dac0 (patch)
treef0265f9a12fe48c34542578cb0db4bcf636c5d0a
parent87f768c624742b789fc3f99295c2a816c3ec4a97 (diff)
parenta17c0c9197986c6bb675c572f10de1a5277238b9 (diff)
downloadmedia-f56133888e0abbd3941d41a101b4f4078510dac0.tar.gz
release-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-4136929 snap-temp-L91700000077883673
Change-Id: I3379e73a683f4ba9ce23c3b473a19f0d96eb444d
-rw-r--r--alsa_utils/Android.bp6
-rw-r--r--alsa_utils/alsa_device_proxy.c2
-rw-r--r--audio_utils/Android.bp8
-rw-r--r--audio_utils/mono_blend.cpp2
4 files changed, 17 insertions, 1 deletions
diff --git a/alsa_utils/Android.bp b/alsa_utils/Android.bp
index 247419f4..db6beb1d 100644
--- a/alsa_utils/Android.bp
+++ b/alsa_utils/Android.bp
@@ -22,6 +22,12 @@ cc_library_shared {
"alsa_format.c",
],
export_include_dirs: ["include"],
+ header_libs: [
+ "libaudio_system_headers",
+ ],
+ export_header_lib_headers: [
+ "libaudio_system_headers",
+ ],
shared_libs: [
"liblog",
"libcutils",
diff --git a/alsa_utils/alsa_device_proxy.c b/alsa_utils/alsa_device_proxy.c
index 9b06d16f..b5d0490e 100644
--- a/alsa_utils/alsa_device_proxy.c
+++ b/alsa_utils/alsa_device_proxy.c
@@ -22,6 +22,8 @@
#include <errno.h>
+#include <stdio.h>
+
#include "include/alsa_device_proxy.h"
#include "include/alsa_logging.h"
diff --git a/audio_utils/Android.bp b/audio_utils/Android.bp
index 713ae2b4..bde8b4ac 100644
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -33,6 +33,14 @@ cc_library {
"roundup.c",
],
+ header_libs: [
+ "libaudio_system_headers",
+ ],
+
+ export_header_lib_headers: [
+ "libaudio_system_headers",
+ ],
+
shared_libs: [
"libcutils",
"liblog",
diff --git a/audio_utils/mono_blend.cpp b/audio_utils/mono_blend.cpp
index 933ccf80..0ace0776 100644
--- a/audio_utils/mono_blend.cpp
+++ b/audio_utils/mono_blend.cpp
@@ -19,7 +19,7 @@
#include <math.h>
#include <audio_utils/mono_blend.h>
-#include <utils/Log.h>
+#include <log/log.h>
#include <audio_utils/limiter.h>
// TODO: Speed up for special case of 2 channels?