Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a72f848 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

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

* commit '70c6c9a1':
  Fix simulator build
parents 29227aaf 70c6c9a1

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -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)

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -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.

*/

*/