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

Merge pull request #171 from asmorkalov:android_8_neon_fix

Browse Source
This commit is contained in:
Andrey Kamaev 2012-11-21 14:55:38 +04:00 committed by OpenCV Buildbot
commit 8579666b03
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/service/engine/AndroidManifest.xml
View File

@ -4,7 +4,7 @@
android:versionCode="22@ANDROID_PLATFORM_VERSION_CODE@" android:versionCode="22@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName="2.2" > android:versionName="2.2" >
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<application <application

8
android/service/engine/CMakeLists.txt
View File

@ -7,15 +7,19 @@ add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 8 ${A
set(ANDROID_PLATFORM_VERSION_CODE "0") set(ANDROID_PLATFORM_VERSION_CODE "0")
if(ARMEABI_V7A) if(ARMEABI_V7A)
if (ANDROID_NATIVE_API_LEVEL LESS 9)
set(ANDROID_PLATFORM_VERSION_CODE "2") set(ANDROID_PLATFORM_VERSION_CODE "2")
else()
set(ANDROID_PLATFORM_VERSION_CODE "3")
endif()
elseif(ARMEABI_V6) elseif(ARMEABI_V6)
set(ANDROID_PLATFORM_VERSION_CODE "1") set(ANDROID_PLATFORM_VERSION_CODE "1")
elseif(ARMEABI) elseif(ARMEABI)
set(ANDROID_PLATFORM_VERSION_CODE "1") set(ANDROID_PLATFORM_VERSION_CODE "1")
elseif(X86) elseif(X86)
set(ANDROID_PLATFORM_VERSION_CODE "3")
elseif(MIPS)
set(ANDROID_PLATFORM_VERSION_CODE "4") set(ANDROID_PLATFORM_VERSION_CODE "4")
elseif(MIPS)
set(ANDROID_PLATFORM_VERSION_CODE "5")
else() else()
message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE") message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
endif() endif()