commit f2df045ae92ee655481f73b19986084308ae684c
author Bill Yi <byi@google.com> Thu Feb 19 14:30:49 2015 -0800
committer Bill Yi <byi@google.com> Thu Feb 19 14:30:49 2015 -0800
tree c0921bf397f2a1eb324c4caacb844c134e4fcc0c
parent 2b6bf8dc0941f3a4531030b950cf24fd31248b0b
parent 10d211b84a5f0790b28fcc8b3db66884d5f9c729

Merge commit '10d211b84a5f0790b28fcc8b3db66884d5f9c729' into HEAD

Android.mk

diff --git a/Android.mk b/Android.mk
index 630f0fe..cfd5113 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,4 @@
 
 LOCAL_MODULE:= libFraunhoferAAC
 
-LOCAL_CLANG:= false
-
 include $(BUILD_STATIC_LIBRARY)

libSYS/src/genericStds.cpp

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 @@
 
 
 /* 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