diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-02-18 02:41:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-18 02:41:47 +0000 |
| commit | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (patch) | |
| tree | c0921bf397f2a1eb324c4caacb844c134e4fcc0c | |
| parent | 1c6ab7db30867f3eee0d550adb015b340fbbc668 (diff) | |
| parent | 09f1d0446737492f2f6e3ec5b668ba6ebf730ab5 (diff) | |
| download | fdk-aac-2b6bf8dc0941f3a4531030b950cf24fd31248b0b.tar.gz fdk-aac-2b6bf8dc0941f3a4531030b950cf24fd31248b0b.tar.bz2 fdk-aac-2b6bf8dc0941f3a4531030b950cf24fd31248b0b.zip | |
Merge "Do not include genericStds_linux.cpp."
| -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 |