generic-library/fdk-aac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2b6bf8dc: Merge "Do not include genericStds_linux.cpp."

Browse Source 
* commit '2b6bf8dc0941f3a4531030b950cf24fd31248b0b':
  Do not include genericStds_linux.cpp.
This commit is contained in:
Chih-Hung Hsieh 2015-02-18 02:53:59 +00:00 committed by Android Git Automerger
commit bd8021bef1
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_MODULE:= libFraunhoferAAC
LOCAL_CLANG:= false
include $(BUILD_STATIC_LIBRARY) 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. */ /* 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