diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-10-28 12:01:42 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-10-28 12:01:42 +0000 |
| commit | 45ebe17b2b7d0aaa14e7b71f7098f970739e1712 (patch) | |
| tree | 15981c339019d8652cc783936b12d2dca54a17e2 /cmake | |
| parent | be8b952fde51d8c83748b41ce232f02b2218451d (diff) | |
cmake: Update android.toolchain.cmake from upstream.
From https://github.com/taka-no-me/android-cmake/commit/763b9f6ec43bf66f3b586669b68b9b6374c8f4b5
Fixes issue #293 for r9* NDKs.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/toolchain/android.toolchain.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/toolchain/android.toolchain.cmake b/cmake/toolchain/android.toolchain.cmake index 457164a1..dfbd1218 100644 --- a/cmake/toolchain/android.toolchain.cmake +++ b/cmake/toolchain/android.toolchain.cmake @@ -301,6 +301,8 @@ # [+] updated for NDK r9c # - January 2014 # [~] fix copying of shared STL +# - April 2014 +# [+] updated for NDK r9d # ------------------------------------------------------------------------------ cmake_minimum_required( VERSION 2.6.3 ) @@ -327,7 +329,7 @@ set( CMAKE_SYSTEM_VERSION 1 ) # rpath makes low sence for Android set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS) if( CMAKE_HOST_WIN32 ) file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) @@ -1744,7 +1746,7 @@ endif() # BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used # ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform # ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c; set only for NDK +# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c, r9d; set only for NDK # ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI # ANDROID_SYSROOT : path to the compiler sysroot # TOOL_OS_SUFFIX : "" or ".exe" depending on host platform |