From f5d327362b596a62f65320e4b2e6329220d83a77 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 10 Apr 2012 14:08:41 +0000 Subject: [PATCH] Android toolchain is updated for NDK r7c --- android/android.toolchain.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index 1cbd299..11c4e1f 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -170,6 +170,8 @@ # [+] improved toolchain loading speed # [+] added assembler language support (.S) # [+] allowed preset search paths and extra search suffixes +# - modified April 2012 Andrey Kamaev andrey.kamaev@itseez.com +# [+] updated for NDK r7c # ------------------------------------------------------------------------------ cmake_minimum_required( VERSION 2.6.3 ) @@ -188,7 +190,7 @@ set( CMAKE_SYSTEM_NAME Linux ) #this one not so much set( CMAKE_SYSTEM_VERSION 1 ) -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -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 ) -- 2.7.4