From 8ecd22ba48cb26052dc399db01ebbbb0cf55d474 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 20 Nov 2012 16:43:30 +0400
Subject: [PATCH] Automatic minsdkversion setup added; Linker problems on
 armeabi-v7a+NEON with Android 2.2 fixed;

---
 android/service/engine/AndroidManifest.xml |  2 +-
 android/service/engine/CMakeLists.txt      | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml
index fdf6303..7a7911e 100644
--- a/android/service/engine/AndroidManifest.xml
+++ b/android/service/engine/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="22@ANDROID_PLATFORM_VERSION_CODE@"
     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"/>
 
     <application
diff --git a/android/service/engine/CMakeLists.txt b/android/service/engine/CMakeLists.txt
index b0d8425..ac0ec7e 100644
--- a/android/service/engine/CMakeLists.txt
+++ b/android/service/engine/CMakeLists.txt
@@ -7,18 +7,22 @@ add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 8 ${A
 set(ANDROID_PLATFORM_VERSION_CODE "0")
 
 if(ARMEABI_V7A)
+  if (ANDROID_NATIVE_API_LEVEL LESS 9)
     set(ANDROID_PLATFORM_VERSION_CODE "2")
-  elseif(ARMEABI_V6)
-    set(ANDROID_PLATFORM_VERSION_CODE "1")
-  elseif(ARMEABI)
-    set(ANDROID_PLATFORM_VERSION_CODE "1")
-  elseif(X86)
-    set(ANDROID_PLATFORM_VERSION_CODE "3")
-  elseif(MIPS)
-    set(ANDROID_PLATFORM_VERSION_CODE "4")
   else()
-    message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
+    set(ANDROID_PLATFORM_VERSION_CODE "3")
   endif()
+elseif(ARMEABI_V6)
+  set(ANDROID_PLATFORM_VERSION_CODE "1")
+elseif(ARMEABI)
+  set(ANDROID_PLATFORM_VERSION_CODE "1")
+elseif(X86)
+  set(ANDROID_PLATFORM_VERSION_CODE "4")
+elseif(MIPS)
+  set(ANDROID_PLATFORM_VERSION_CODE "5")
+else()
+  message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
+endif()
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/android/service/engine/.build/${ANDROID_MANIFEST_FILE}"  @ONLY)
 
-- 
2.7.4