Refactor Android related CMake configuration

CMakeLists.txt

@@ -738,7 +738,7 @@ if(UNIX)
 
     # Makefile
     set(MAKEFILE_LDSHARED_FLAGS "-shared")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if(APPLE OR ANDROID)
         set(MAKEFILE_LDSHARED_FLAGS "-dynamiclib -headerpad_max_install_names -undefined dynamic_lookup")
     endif()
     configure_file(cmake/makefile-variables.in

cmake/ConfigureChecks.cmake

@@ -275,7 +275,7 @@ check_include_files(grp.h HAVE_GRP_H)
 check_include_files(ieeefp.h HAVE_IEEEFP_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H) # libffi and cpython
 check_include_files(io.h HAVE_IO_H)
-if (${CMAKE_SYSTEM_NAME} MATCHES "^Android")
+if (ANDROID)
   set(HAVE_LANGINFO_H 0) # Android cann't link functions from langinfo.h
 else()
   check_include_files(langinfo.h HAVE_LANGINFO_H)
@@ -446,11 +446,6 @@ if((CMAKE_SYSTEM MATCHES "VxWorks\\-7$") OR ANDROID)
   set(HAVE_LIBUTIL 0)
 endif()
 
-if(CMAKE_SYSTEM MATCHES "^Android")
-  set(LIBUTIL_EXPECTED 0)
-  set(HAVE_LIBUTIL 0)
-endif()
-
 if(LIBUTIL_EXPECTED)
   check_function_exists("openpty" HAVE_BUILTIN_OPENPTY)
   if(HAVE_BUILTIN_OPENPTY)

cmake/Extensions.cmake

@@ -196,7 +196,7 @@ function(add_python_extension name)
             )
         endif()
 
-        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        if(APPLE OR ANDROID)
             set_target_properties(${target_name} PROPERTIES
                 LINK_FLAGS -Wl,-undefined,dynamic_lookup
                 SUFFIX .so

cmake/lib/CMakeLists.txt

@@ -43,7 +43,7 @@ endif()
 
 # Generate grammar tables in install directory
 # XXX Should a custom target be added to generate file at built time ?
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "^Android")
+if(NOT ANDROID)
   install(CODE "find_program(
     PYTHON_EXECUTABLE python
     HINTS \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}

cmake/python/CMakeLists.txt

@@ -50,7 +50,7 @@ if(WIN32)
         )
 endif()
 
-if(UNIX AND PY_VERSION VERSION_GREATER "2.7.4" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^Android")
+if(UNIX AND PY_VERSION VERSION_GREATER "2.7.4" AND NOT ANDROID)
     # Setup landmark allowing to run the interpreter from a build tree. See 'getpath.c' for details.
     set(_sysconfigdata_py "_sysconfigdata.py")
     if("${PY_VERSION}" VERSION_GREATER_EQUAL "3.6.0")