add android-x86 and upgrade do android-21

3 files changed, 63 insertions, 2 deletions

diff --git a/toolchain/android-arm.cmake b/toolchain/android-arm.cmake
index 9801f5a..04314d0 100644
--- a/toolchain/android-arm.cmake
+++ b/toolchain/android-arm.cmake
@@ -36,7 +36,7 @@ endif()
 #endif()
 
 # specify the cross compiler
-set(COMPILER_PREFIX    /var/www/ud_3/xbmc/x-tools/android-14/bin/arm-linux-androideabi)
+set(COMPILER_PREFIX    /var/www/ud_3/xbmc/x-tools/android-21-arm/bin/arm-linux-androideabi)
 set(CMAKE_C_COMPILER   ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
 set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
diff --git a/toolchain/android-arm64-v8a.cmake b/toolchain/android-arm64-v8a.cmake
index 87e95e0..aea36d7 100644
--- a/toolchain/android-arm64-v8a.cmake
+++ b/toolchain/android-arm64-v8a.cmake
@@ -36,7 +36,7 @@ endif()
 #endif()
 
 # specify the cross compiler
-set(COMPILER_PREFIX    /var/www/ud_3/xbmc/x-tools/android-14/bin/arm-linux-androideabi)
+set(COMPILER_PREFIX    /var/www/ud_3/xbmc/x-tools/android-21-aarch64/bin/aarch64-linux-android)
 set(CMAKE_C_COMPILER   ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
 set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
diff --git a/toolchain/android-x86.cmake b/toolchain/android-x86.cmake
new file mode 100644
index 0000000..4208bf4
--- /dev/null
+++ b/toolchain/android-x86.cmake
@@ -0,0 +1,61 @@
+set(CMAKE_SYSTEM_VERSION 1)
+set(OS "android")
+set(CPU "i686")
+set(PLATFORM "")
+if("${OS}" STREQUAL "linux" OR "${OS}" STREQUAL "android")
+  set(CMAKE_SYSTEM_NAME Linux)
+endif()
+
+# set special CORE_SYSTEM_NAME
+if("${OS}" STREQUAL "android")
+  set(CORE_SYSTEM_NAME android)
+elseif("${OS}" STREQUAL "ios")
+  set(CORE_SYSTEM_NAME ios)
+elseif("${PLATFORM}" STREQUAL "raspberry-pi")
+  set(CORE_SYSTEM_NAME rbpi)
+elseif("${PLATFORM}" STREQUAL "darwin")
+  set(CORE_SYSTEM_NAME osx)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+
+#set(CMAKE_FIND_ROOT_PATH @CMAKE_FIND_ROOT_PATH@)
+
+if("${OS}" STREQUAL "ios" OR "${OS}" STREQUAL "osx")
+  set(CMAKE_SYSTEM_NAME Darwin)
+  #set(CMAKE_OSX_SYSROOT @use_sdk_path@)
+  #list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT}/usr)
+  #set(CMAKE_LIBRARY_PATH @CMAKE_FIND_ROOT_PATH@/lib:@use_sdk_path@/lib)
+  #set(CMAKE_INCLUDE_PATH @CMAKE_FIND_ROOT_PATH@/include:@use_sdk_path@/include)
+endif()
+
+#if("${CORE_SYSTEM_NAME}" STREQUAL "rbpi")
+#  list(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc)
+#  set(CMAKE_LIBRARY_PATH @CMAKE_FIND_ROOT_PATH@/lib:@use_firmware@/opt/vc/lib)
+#  set(CMAKE_INCLUDE_PATH @CMAKE_FIND_ROOT_PATH@/include:@use_firmware@/opt/vc/include)
+#endif()
+
+# specify the cross compiler
+set(COMPILER_PREFIX    /var/www/ud_3/xbmc/x-tools/android-21-x86/bin/i686-linux-android)
+set(CMAKE_C_COMPILER   ${COMPILER_PREFIX}-gcc)
+set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
+set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
+set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
+set(CMAKE_STRIP        ${COMPILER_PREFIX}-strip)
+set(CMAKE_C_FLAGS      "-DANDROID -Os -fexceptions")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS} -frtti")
+set(CMAKE_CPP_FLAGS    "")
+set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
+set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
+set(ENV{CPPFLAGS} ${CMAKE_CPP_FLAGS})
+
+# search for programs in the build host directories
+#set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+#set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+#set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+if(NOT OS STREQUAL "linux")
+  set(ADDONS_PREFER_STATIC_LIBS ON)
+endif()