diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-02-12 10:31:26 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2015-02-12 11:20:14 -0800 |
| commit | 09f1d0446737492f2f6e3ec5b668ba6ebf730ab5 (patch) | |
| tree | c0921bf397f2a1eb324c4caacb844c134e4fcc0c | |
| parent | 1c6ab7db30867f3eee0d550adb015b340fbbc668 (diff) | |
| download | android_external_aac-09f1d0446737492f2f6e3ec5b668ba6ebf730ab5.tar.gz android_external_aac-09f1d0446737492f2f6e3ec5b668ba6ebf730ab5.tar.bz2 android_external_aac-09f1d0446737492f2f6e3ec5b668ba6ebf730ab5.zip | |
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
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | libSYS/src/genericStds.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -57,6 +57,4 @@ LOCAL_CPPFLAGS += -std=c++98 LOCAL_MODULE:= libFraunhoferAAC -LOCAL_CLANG:= false - include $(BUILD_STATIC_LIBRARY) diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp index 3381e37..72b5467 100644 --- a/libSYS/src/genericStds.cpp +++ b/libSYS/src/genericStds.cpp @@ -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 |