Android toolchain: restored explicit include_directories of system /usr/include

It is needed because of explicit STL include paths.
Otherwise some standard headers (like fenv.h) can not not be correctly found by the compiler.

diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake
index b8dd429..c1a9d7d 100644 (file)
--- a/android/android.toolchain.cmake
+++ b/android/android.toolchain.cmake
@@ -1175,12 +1175,9 @@ if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES )
 endif()
 
 # global includes and link directories
-if( ANDROID_STL_INCLUDE_DIRS )
- include_directories( SYSTEM ${ANDROID_STL_INCLUDE_DIRS} )
-endif()
+include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
 link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
 
-
 # set these global flags for cmake client scripts to change behavior
 set( ANDROID True )
 set( BUILD_ANDROID True )