summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-07-13 13:28:08 -0700
committer James Dong <jdong@google.com> 2010-07-13 13:29:33 -0700
commit70c6c9a1e2240e82d8eb442b34efa9629ef2bba4 (patch)
tree168322850d50cfd3314cc0c71ff13030b23fe890
parentc1ca7f8c537195b830695ca988945c9d1df0e0e4 (diff)
Fix simulator build
- missing header file <string.h> - need to define -D__arm__ Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
-rw-r--r--media/libstagefright/codecs/avc/enc/Android.mk1
-rw-r--r--media/libstagefright/codecs/avc/enc/src/avcenc_api.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk
index 735eb0ce8f58..100f239e79d9 100644
--- a/media/libstagefright/codecs/avc/enc/Android.mk
+++ b/media/libstagefright/codecs/avc/enc/Android.mk
@@ -29,6 +29,7 @@ LOCAL_C_INCLUDES := \
$(TOP)/frameworks/base/media/libstagefright/include
LOCAL_CFLAGS := \
+ -D__arm__ \
-DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=
include $(BUILD_STATIC_LIBRARY)
diff --git a/media/libstagefright/codecs/avc/enc/src/avcenc_api.h b/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
index 628dec60c57c..6841ec33c77d 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 @@ and necessary type defitionitions and enumerations.
#include "avcapi_common.h"
#endif
+// For memset, etc
+#include <string.h>
+
/**
This enumeration is used for the status returned from the library interface.
*/