summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2017-06-27 01:18:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-06-27 01:18:39 +0000
commit10be5075f268a54a048351b30e3ee38d0a7891ea (patch)
tree18baa4f09db0987459a9d67c908f9355ff0495b3
parent5ce9898e0810681a29ed6630206839c561b3648a (diff)
parent82d945007ff47d7e7fa9390b8a8afe8620c1fc5e (diff)
downloadmedia-10be5075f268a54a048351b30e3ee38d0a7891ea.tar.gz
Merge "fix missing headers"
-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 73e43758..96b880de 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 abec8819..36023f51 100644
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -28,6 +28,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?