generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6785 from alalek:android_native_level

Browse Source
This commit is contained in:
Alexander Alekhin 2016-07-07 15:48:01 +00:00
commit 630406e006
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/android.toolchain.cmake
View File

@ -244,7 +244,7 @@ set( ANDROID_SUPPORTED_ABIS_mips "mips" )
set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" )
# API level defaults # API level defaults
set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) set( ANDROID_DEFAULT_NDK_API_LEVEL 9 )
set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 )
set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 )

2
platforms/android/build_sdk.py
View File

@ -130,7 +130,7 @@ class Builder:
"-DBUILD_ANDROID_EXAMPLES=ON", "-DBUILD_ANDROID_EXAMPLES=ON",
"-DINSTALL_ANDROID_EXAMPLES=ON", "-DINSTALL_ANDROID_EXAMPLES=ON",
"-DANDROID_STL=gnustl_static", "-DANDROID_STL=gnustl_static",
"-DANDROID_NATIVE_API_LEVEL=8", "-DANDROID_NATIVE_API_LEVEL=9",
"-DANDROID_ABI='%s'" % abi.cmake_name, "-DANDROID_ABI='%s'" % abi.cmake_name,
"-DWITH_TBB=ON", "-DWITH_TBB=ON",
"-DANDROID_TOOLCHAIN_NAME=%s" % abi.toolchain "-DANDROID_TOOLCHAIN_NAME=%s" % abi.toolchain