Add:Build:Allow different api level settings for android sdk and ndk

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4795 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/Toolchain/arm-eabi.cmake b/navit/Toolchain/arm-eabi.cmake
index 16a21f0..f486028 100755 (executable)
--- a/navit/Toolchain/arm-eabi.cmake
+++ b/navit/Toolchain/arm-eabi.cmake
@@ -2,6 +2,7 @@ set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
 set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version")
+set(ANDROID_NDK_API_VERSION ANDROID_API_VERSION CACHE STRING "Andriod NDK API Version")
 
 find_program(CMAKE_C_COMPILER NAMES arm-eabi-gcc arm-eabi-gcc.exe arm-linux-androideabi-gcc arm-linux-androideabi-gcc.exe)
 find_program(CMAKE_CXX_COMPILER NAMES arm-eabi-gcc arm-eabi-g++.exe arm-linux-androideabi-g++ arm-linux-androideabi-g++.exe)
@@ -11,7 +12,7 @@ get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH)
 
 set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK")
 
-set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_API_VERSION}/arch-arm")
+set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm")
 set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR})
 
 set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib")