diff options
| author | Tri Vo <trong@google.com> | 2017-06-27 01:27:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 01:27:12 +0000 |
| commit | f3ab3d7c1f4f2179a35849a40e8f777a73713648 (patch) | |
| tree | f0265f9a12fe48c34542578cb0db4bcf636c5d0a | |
| parent | 05ea368284783055aca8de92970b193ab3e2f850 (diff) | |
| parent | e169ccc7f8c87a14b11a870bc90b69510c607d20 (diff) | |
| download | android_system_media-f3ab3d7c1f4f2179a35849a40e8f777a73713648.tar.gz android_system_media-f3ab3d7c1f4f2179a35849a40e8f777a73713648.tar.bz2 android_system_media-f3ab3d7c1f4f2179a35849a40e8f777a73713648.zip | |
Merge "fix missing headers" am: 10be5075f2 am: 7180e89fd2
am: e169ccc7f8
Change-Id: I2de586c016f8559aafaee7681df4556d398043cc
| -rw-r--r-- | alsa_utils/Android.bp | 6 | ||||
| -rw-r--r-- | alsa_utils/alsa_device_proxy.c | 2 | ||||
| -rw-r--r-- | audio_utils/Android.bp | 8 | ||||
| -rw-r--r-- | audio_utils/mono_blend.cpp | 2 |
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? |