summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-25 19:27:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-25 19:27:25 +0000
commitf51d65ade0112c3d50c3d9182f583730a597322b (patch)
tree55f55b1e4224aef0b6af3e6a748ab6715c6643bf /media
parent5d4d8d68fcc5a7a18effcf12e8f032c434eb469b (diff)
parent86b48b3f8056a8efa6857d87dd4f30495e8b0464 (diff)
downloadframeworks_base-f51d65ade0112c3d50c3d9182f583730a597322b.zip
frameworks_base-f51d65ade0112c3d50c3d9182f583730a597322b.tar.gz
frameworks_base-f51d65ade0112c3d50c3d9182f583730a597322b.tar.bz2
Merge "Add missing <string.h> includes." automerge: 82a1a2c
automerge: 86b48b3 * commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464': Add missing <string.h> includes.
Diffstat (limited to 'media')
-rw-r--r--media/mca/filterfw/native/core/value.cpp1
-rw-r--r--media/mca/filterpacks/native/imageproc/brightness.c1
-rw-r--r--media/mca/filterpacks/native/imageproc/contrast.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/media/mca/filterfw/native/core/value.cpp b/media/mca/filterfw/native/core/value.cpp
index 04bf0ef..c0ea763 100644
--- a/media/mca/filterfw/native/core/value.cpp
+++ b/media/mca/filterfw/native/core/value.cpp
@@ -16,6 +16,7 @@
#include <stddef.h>
#include <stdlib.h>
+#include <string.h>
#include "value.h"
diff --git a/media/mca/filterpacks/native/imageproc/brightness.c b/media/mca/filterpacks/native/imageproc/brightness.c
index f4addf1..3c3652f 100644
--- a/media/mca/filterpacks/native/imageproc/brightness.c
+++ b/media/mca/filterpacks/native/imageproc/brightness.c
@@ -16,6 +16,7 @@
#include <android/log.h>
#include <stdlib.h>
+#include <string.h>
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, "MCA", __VA_ARGS__)
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, "MCA", __VA_ARGS__)
diff --git a/media/mca/filterpacks/native/imageproc/contrast.c b/media/mca/filterpacks/native/imageproc/contrast.c
index ea8c8d2..31c975c 100644
--- a/media/mca/filterpacks/native/imageproc/contrast.c
+++ b/media/mca/filterpacks/native/imageproc/contrast.c
@@ -16,6 +16,7 @@
#include <android/log.h>
#include <stdlib.h>
+#include <string.h>
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, "MCA", __VA_ARGS__)
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, "MCA", __VA_ARGS__)