summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-29 01:42:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 01:42:30 +0000
commita3c9d5c3982591042c7c6cb5fb7c32fbd4765832 (patch)
treeaacc0644ff37836e2ca3019825b4454584462c5e /media
parentba553472948080e05c653c44ece1357946c6efcb (diff)
parent166776fbbeb74e28a736681a5edd355013b976ad (diff)
downloadframeworks_av-a3c9d5c3982591042c7c6cb5fb7c32fbd4765832.zip
frameworks_av-a3c9d5c3982591042c7c6cb5fb7c32fbd4765832.tar.gz
frameworks_av-a3c9d5c3982591042c7c6cb5fb7c32fbd4765832.tar.bz2
am 166776fb: Merge "Add missing includes."
* commit '166776fbbeb74e28a736681a5edd355013b976ad': Add missing includes.
Diffstat (limited to 'media')
-rw-r--r--media/libcpustats/ThreadCpuUsage.cpp1
-rw-r--r--media/libmedia/MemoryLeakTrackUtil.cpp1
-rw-r--r--media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/media/libcpustats/ThreadCpuUsage.cpp b/media/libcpustats/ThreadCpuUsage.cpp
index 7b5b661..b43b36c 100644
--- a/media/libcpustats/ThreadCpuUsage.cpp
+++ b/media/libcpustats/ThreadCpuUsage.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
#include <utils/Log.h>
diff --git a/media/libmedia/MemoryLeakTrackUtil.cpp b/media/libmedia/MemoryLeakTrackUtil.cpp
index 66f7161..d31f721 100644
--- a/media/libmedia/MemoryLeakTrackUtil.cpp
+++ b/media/libmedia/MemoryLeakTrackUtil.cpp
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp b/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
index 521fe2b..41a9e98 100644
--- a/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
+++ b/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
@@ -26,6 +26,7 @@
* SUCH DAMAGE.
*/
+#include <malloc.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>