commit 0e7356fcc9cd3b4c5cde9c95159088e5b1a59f5d
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Aug 09 01:50:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 01:50:01 2017 +0000
tree 9d37e0ad67f37f1e2a3c8716a88f4a85c4b53ac7
parent 7c8084e4b1471919a0676a27833df4f57bc4cff7
parent 2b57c9ada192e3c79511252c03ce423eb7261ee7

Camera: update NDK docs am: f850d6ea72
am: 2b57c9ada1

Change-Id: I0c6c9ac846278c0330c80b3f91fddbf5d210e471

alsa_utils/Android.bp

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",

alsa_utils/alsa_device_proxy.c

diff --git a/alsa_utils/alsa_device_proxy.c b/alsa_utils/alsa_device_proxy.c
index 9b06d16..b5d0490 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"

audio_utils/Android.bp

diff --git a/audio_utils/Android.bp b/audio_utils/Android.bp
index 713ae2b..bde8b4a 100644
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -33,6 +33,14 @@
         "roundup.c",
     ],
 
+    header_libs: [
+        "libaudio_system_headers",
+    ],
+
+    export_header_lib_headers: [
+        "libaudio_system_headers",
+    ],
+
     shared_libs: [
         "libcutils",
         "liblog",

audio_utils/channels.c

diff --git a/audio_utils/channels.c b/audio_utils/channels.c
index 538deba..91d18fd 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) {
 #if 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;
 #if HAVE_BIG_ENDIAN
     out.c[2] = in;

audio_utils/mono_blend.cpp

diff --git a/audio_utils/mono_blend.cpp b/audio_utils/mono_blend.cpp
index 933ccf8..0ace077 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?

camera/OWNERS

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