Merge "Do not include genericStds_linux.cpp."

This commit is contained in:
Chih-Hung Hsieh 2015-02-18 02:41:47 +00:00 committed by Gerrit Code Review
commit 2b6bf8dc09
2 changed files with 1 additions and 3 deletions

View File

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

View File

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