Merge "Do not include genericStds_linux.cpp."

2b6bf8dc · Chih-Hung Hsieh · Gerrit Code Review · 1c6ab7db · 09f1d044 · 2b6bf8dc
Commit 2b6bf8dc authored Feb 18, 2015 by Chih-Hung Hsieh Committed by Gerrit Code Review Feb 18, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Android.mk Android.mk +0 -2

libSYS/src/genericStds.cpp libSYS/src/genericStds.cpp +1 -1

No files found.
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,4 @@ LOCAL_CPPFLAGS += -std=c++98

 LOCAL_MODULE:= libFraunhoferAAC

-LOCAL_CLANG:= false
-
 include $(BUILD_STATIC_LIBRARY)
--- 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