Merge "Do not include genericStds_linux.cpp."
This commit is contained in:
commit
2b6bf8dc09
@ -57,6 +57,4 @@ LOCAL_CPPFLAGS += -std=c++98
|
||||
|
||||
LOCAL_MODULE:= libFraunhoferAAC
|
||||
|
||||
LOCAL_CLANG:= false
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user