diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-29 17:22:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 17:22:05 +0000 |
| commit | f26334cf7d60060e0e33b037dd9504c81b2e10eb (patch) | |
| tree | 0862537ea39c13222a34f9ede807157dff0a4743 | |
| parent | 5ba2e2cbb6ae3d470bf3031507ea938be6066ed7 (diff) | |
| parent | 6a0fbc68e203058e3b7d62e95d46f2415bc3ed95 (diff) | |
| download | frameworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.zip frameworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.tar.gz frameworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.tar.bz2 | |
am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."
* commit '6a0fbc68e203058e3b7d62e95d46f2415bc3ed95':
Add missing includes.
| -rw-r--r-- | cmds/screenrecord/TextRenderer.cpp | 2 | ||||
| -rw-r--r-- | media/libcpustats/ThreadCpuUsage.cpp | 1 | ||||
| -rw-r--r-- | media/libmedia/MemoryLeakTrackUtil.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/cmds/screenrecord/TextRenderer.cpp b/cmds/screenrecord/TextRenderer.cpp index 6a9176b..01f73e0 100644 --- a/cmds/screenrecord/TextRenderer.cpp +++ b/cmds/screenrecord/TextRenderer.cpp @@ -21,6 +21,8 @@ #include "TextRenderer.h" #include <assert.h> +#include <malloc.h> +#include <string.h> namespace android { #include "FontBitmap.h" 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> |