Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build
This commit is contained in:
James Dong
2010-07-13 13:43:39 -07:00
committed by Android Git Automerger
parent 29227aafa0 70c6c9a1e2
commit 7a72f84801
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libstagefright/codecs/avc/enc/Android.mk
View File

@@ -29,6 +29,7 @@ LOCAL_C_INCLUDES := \
$(TOP)/frameworks/base/media/libstagefright/include $(TOP)/frameworks/base/media/libstagefright/include
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
-D__arm__ \
-DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

3
media/libstagefright/codecs/avc/enc/src/avcenc_api.h
View File

@@ -28,6 +28,9 @@ and necessary type defitionitions and enumerations.
#include "avcapi_common.h" #include "avcapi_common.h"
#endif #endif
// For memset, etc
#include <string.h>
/** /**
This enumeration is used for the status returned from the library interface. This enumeration is used for the status returned from the library interface.
*/ */