fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not include genericStds_linux.cpp. 

The __aeabi_memcpy functions are already defined in Android libc.
Redefining them to call memcpy will become recursive when clang/llvm
converts the memcpy call to __aeabi_memcpy.
With this change, we can enable clang/llvm by removing LOCAL_CLANG from Android.mk.

BUG: 12216385
Change-Id: I8b8b4ba7f3ff1e66f8110fc3b6356865a582c1d8
This commit is contained in:
Chih-Hung Hsieh 2015-02-12 10:31:26 -08:00
parent 1c6ab7db30
commit 09f1d04467
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -57,6 +57,4 @@ LOCAL_CPPFLAGS += -std=c++98
LOCAL_MODULE:= libFraunhoferAAC
LOCAL_CLANG:= false
include $(BUILD_STATIC_LIBRARY)

2
libSYS/src/genericStds.cpp
View File

@ -116,7 +116,7 @@ amm-info@iis.fraunhofer.de
/* Include OS/System specific implementations. */
#if defined(__linux__) /* cppp replaced: elif */
#if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */
#include "linux/genericStds_linux.cpp"
#endif