diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-02-18 02:53:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 02:53:59 +0000 |
| commit | bd8021bef1126d90f285ab672442de37a2ef9ee6 (patch) | |
| tree | c0921bf397f2a1eb324c4caacb844c134e4fcc0c | |
| parent | 10d211b84a5f0790b28fcc8b3db66884d5f9c729 (diff) | |
| parent | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (diff) | |
| download | fdk-aac-bd8021bef1126d90f285ab672442de37a2ef9ee6.tar.gz fdk-aac-bd8021bef1126d90f285ab672442de37a2ef9ee6.tar.bz2 fdk-aac-bd8021bef1126d90f285ab672442de37a2ef9ee6.zip | |
am 2b6bf8dc: Merge "Do not include genericStds_linux.cpp."
* commit '2b6bf8dc0941f3a4531030b950cf24fd31248b0b':
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 |