+ Support Android native camera.

jasonxunxu · jasonxunxu · commit 33c5b7765f51 · 2015-01-29T01:33:37.000-08:00
diff --git a/recipes/opencv/patches/p4a_build-2.4.10.1.patch b/recipes/opencv/patches/p4a_build-2.4.10.1.patch
@@ -42,3 +42,24 @@ index 3c0f2fd..7ba234a 100644
    ocv_module_disable(python)
  endif()
  
+diff --git a/modules/androidcamera/src/camera_activity.cpp b/modules/androidcamera/src/camera_activity.cpp
+index 84db3e1..4222526 100644
+--- a/modules/androidcamera/src/camera_activity.cpp
++++ b/modules/androidcamera/src/camera_activity.cpp
+@@ -7,6 +7,7 @@
+ #include <string>
+ #include <vector>
+ #include <algorithm>
++#include <stdlib.h>
+ #include <opencv2/core/version.hpp>
+ #include "camera_activity.hpp"
+ #include "camera_wrapper.h"
+@@ -342,6 +343,8 @@ std::string CameraWrapperConnector::getPathLibFolder()
+ 
+                 char* pathEnd = strrchr(pathBegin, '/');
+                 pathEnd[1] = 0;
++                pathBegin = realpath((std::string(pathBegin)+"../../../../lib").c_str(), lineBuf);
++                pathBegin = strcat(pathBegin, "/");
+ 
+                 LOGD("Libraries folder found: %s", pathBegin);
+ 
diff --git a/recipes/opencv/recipe.sh b/recipes/opencv/recipe.sh
@@ -35,6 +35,7 @@ function build_opencv() {
 	cd $_cvbuild
 
 	push_arm
+	#try set > opencv_p4y_env.log # check env vars for debugging
 
 	export ANDROID_NDK=$ANDROIDNDK
 	try cmake -DP4A=ON -DANDROID_ABI=$ARCH -DCMAKE_TOOLCHAIN_FILE=$_cvsrc/platforms/android/android.toolchain.cmake \
@@ -46,6 +47,7 @@ function build_opencv() {
 	  $_cvsrc
 	try make -j8 opencv_python
 	try cmake -DCOMPONENT=python -P ./cmake_install.cmake
+	try cp -a $_cvbuild/lib/$ARCH/lib*.so $LIBS_PATH
 
 	pop_arm
 }
