diff options
| author | 2010-07-13 13:43:39 -0700 | |
|---|---|---|
| committer | 2010-07-13 13:43:39 -0700 | |
| commit | 7a72f84801c3ad74f00f5d3d0da7e2212d07a911 (patch) | |
| tree | b0e2754b624536b2336f77757d73d149e5706b19 | |
| parent | 29227aafa06092a28995ac9611012f2060b6b34f (diff) | |
| parent | 70c6c9a1e2240e82d8eb442b34efa9629ef2bba4 (diff) | |
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
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/src/avcenc_api.h | 3 |
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. */ |