Merge "Revert "media: Update libchrome APIS to r456626.""
diff --git a/alsa_utils/Android.bp b/alsa_utils/Android.bp
index 247419f..db6beb1 100644
--- a/alsa_utils/Android.bp
+++ b/alsa_utils/Android.bp
@@ -22,6 +22,12 @@
"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 73e4375..96b880d 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 629e864..36023f5 100644
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -28,6 +28,14 @@
"roundup.c",
],
+ header_libs: [
+ "libaudio_system_headers",
+ ],
+
+ export_header_lib_headers: [
+ "libaudio_system_headers",
+ ],
+
shared_libs: [
"libcutils",
"liblog",
@@ -36,7 +44,7 @@
target: {
android: {
srcs: [
- "conversion.cpp",
+ "mono_blend.cpp",
"resampler.c",
"echo_reference.c",
],
@@ -53,6 +61,7 @@
cc_library_static {
name: "libaudioutils_fixedfft",
+ vendor_available: true,
defaults: ["audio_utils_defaults"],
arch: {
diff --git a/audio_utils/channels.c b/audio_utils/channels.c
index fa005d3..1e22e8b 100644
--- a/audio_utils/channels.c
+++ b/audio_utils/channels.c
@@ -32,7 +32,7 @@
/*
* Converts a uint8x3_t into an int32_t
*/
-inline int32_t uint8x3_to_int32(uint8x3_t val) {
+static inline int32_t uint8x3_to_int32(uint8x3_t val) {
#ifdef HAVE_BIG_ENDIAN
int32_t temp = (val.c[0] << 24 | val.c[1] << 16 | val.c[2] << 8) >> 8;
#else
@@ -44,7 +44,7 @@
/*
* Converts an int32_t to a uint8x3_t
*/
-inline uint8x3_t int32_to_uint8x3(int32_t in) {
+static inline uint8x3_t int32_to_uint8x3(int32_t in) {
uint8x3_t out;
#ifdef HAVE_BIG_ENDIAN
out.c[2] = in;
diff --git a/audio_utils/include/audio_utils/conversion.h b/audio_utils/include/audio_utils/mono_blend.h
similarity index 100%
rename from audio_utils/include/audio_utils/conversion.h
rename to audio_utils/include/audio_utils/mono_blend.h
diff --git a/audio_utils/conversion.cpp b/audio_utils/mono_blend.cpp
similarity index 95%
rename from audio_utils/conversion.cpp
rename to audio_utils/mono_blend.cpp
index a2d931f..0ace077 100644
--- a/audio_utils/conversion.cpp
+++ b/audio_utils/mono_blend.cpp
@@ -15,11 +15,11 @@
*/
//#define LOG_NDEBUG 0
-#define LOG_TAG "audio_utils_conversion"
+#define LOG_TAG "audio_utils_mono_blend"
#include <math.h>
-#include <audio_utils/conversion.h>
-#include <utils/Log.h>
+#include <audio_utils/mono_blend.h>
+#include <log/log.h>
#include <audio_utils/limiter.h>
// TODO: Speed up for special case of 2 channels?
diff --git a/camera/OWNERS b/camera/OWNERS
new file mode 100644
index 0000000..18acfee
--- /dev/null
+++ b/camera/OWNERS
@@ -0,0 +1,6 @@
+cychen@google.com
+epeev@google.com
+etalvala@google.com
+shuzhenwang@google.com
+yinchiayeh@google.com
+zhijunhe@google.com
