commit d205cba01a3bdab8a81c5079e2c21d1948e5fa2f
author James Dong <jdong@google.com> Tue Jul 13 13:43:39 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 13 13:43:39 2010 -0700
tree c7cb30e70c745bc2952fbafe2ccc5efae216fb43
parent d3d18df30d06fa0b5b9f25c7eeda6b23db2cb533
parent d54329e48d2ee6bc6b24d148770eec562e10e739

am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build

media/libstagefright/codecs/avc/enc/Android.mk

diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk
index 735eb0c..100f239 100644
--- a/media/libstagefright/codecs/avc/enc/Android.mk
+++ b/media/libstagefright/codecs/avc/enc/Android.mk
@@ -29,6 +29,7 @@
     $(TOP)/frameworks/base/media/libstagefright/include
 
 LOCAL_CFLAGS := \
+    -D__arm__ \
     -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=
 
 include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/avc/enc/src/avcenc_api.h

diff --git a/media/libstagefright/codecs/avc/enc/src/avcenc_api.h b/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
index 628dec6..6841ec3 100644
--- a/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
+++ b/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
@@ -28,6 +28,9 @@
 #include "avcapi_common.h"
 #endif
 
+// For memset, etc
+#include <string.h>
+
 /**
  This enumeration is used for the status returned from the library interface.
 */