From 09f1d0446737492f2f6e3ec5b668ba6ebf730ab5 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 12 Feb 2015 10:31:26 -0800 Subject: [PATCH] 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 --- Android.mk | 2 -- libSYS/src/genericStds.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 630f0fe..cfd5113 100644 --- a/Android.mk +++ b/Android.mk @@ -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