From af912f4843f047329319ba6208a7ccc7ba09a221 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 2 Jul 2012 13:46:47 +0000 Subject: [PATCH] Merged the trunk r8901:8904 --- android/package/CMakeLists.txt | 4 +- cmake/OpenCVDetectAndroidSDK.cmake | 2 +- modules/java/generator/src/java/android+Utils.java | 5 -- samples/android/face-detection/.cproject | 84 ++++++++++++++++++++++ samples/android/face-detection/.project | 68 ++++++++++++++++++ samples/android/tutorial-3-native/.cproject | 84 ++++++++++++++++++++++ samples/android/tutorial-3-native/.project | 68 ++++++++++++++++++ samples/android/tutorial-4-mixed/.cproject | 83 +++++++++++++++++++++ samples/android/tutorial-4-mixed/.project | 68 ++++++++++++++++++ 9 files changed, 458 insertions(+), 8 deletions(-) create mode 100644 samples/android/face-detection/.cproject create mode 100644 samples/android/tutorial-3-native/.cproject create mode 100644 samples/android/tutorial-4-mixed/.cproject diff --git a/android/package/CMakeLists.txt b/android/package/CMakeLists.txt index 35025b3..191e61d 100644 --- a/android/package/CMakeLists.txt +++ b/android/package/CMakeLists.txt @@ -85,8 +85,8 @@ add_custom_command( COMMAND ${ANT_EXECUTABLE} -q -noinput -k release COMMAND ${CMAKE_COMMAND} -E touch "${APK_NAME}" WORKING_DIRECTORY "${PACKAGE_DIR}" - MAIN_DEPENDENCY "${opencv_java_location}" - DEPENDS "${PACKAGE_DIR}/${ANDROID_MANIFEST_FILE}" "${PACKAGE_DIR}/res/values/strings.xml" "${PACKAGE_DIR}/res/drawable/icon.png" ${camera_wrappers} + MAIN_DEPENDENCY "${PACKAGE_DIR}/${ANDROID_MANIFEST_FILE}" + DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" "${PACKAGE_DIR}/res/values/strings.xml" "${PACKAGE_DIR}/res/drawable/icon.png" ${camera_wrappers} opencv_java ) add_custom_target(android_package ALL SOURCES "${APK_NAME}" ) diff --git a/cmake/OpenCVDetectAndroidSDK.cmake b/cmake/OpenCVDetectAndroidSDK.cmake index f1bc549..d83b855 100644 --- a/cmake/OpenCVDetectAndroidSDK.cmake +++ b/cmake/OpenCVDetectAndroidSDK.cmake @@ -324,7 +324,7 @@ macro(add_android_project target path) install(FILES "${android_proj_bin_dir}/${f}" DESTINATION "samples/${sample_dir}/${install_subdir}" COMPONENT main) endforeach() #jni part + eclipse files - file(GLOB_RECURSE jni_files RELATIVE "${path}" "${path}/jni/*") + file(GLOB_RECURSE jni_files RELATIVE "${path}" "${path}/jni/*" "${path}/.cproject") ocv_list_filterout(jni_files "\\\\.svn") foreach(f ${jni_files} ".classpath" ".project" ".settings/org.eclipse.jdt.core.prefs") get_filename_component(install_subdir "${f}" PATH) diff --git a/modules/java/generator/src/java/android+Utils.java b/modules/java/generator/src/java/android+Utils.java index 28ca261..a990cd1 100644 --- a/modules/java/generator/src/java/android+Utils.java +++ b/modules/java/generator/src/java/android+Utils.java @@ -133,11 +133,6 @@ public class Utils { } - // native stuff - static { - System.loadLibrary("opencv_java"); - } - private static native void nBitmapToMat2(Bitmap b, long m_addr, boolean unPremultiplyAlpha); private static native void nMatToBitmap2(long m_addr, Bitmap b, boolean premultiplyAlpha); diff --git a/samples/android/face-detection/.cproject b/samples/android/face-detection/.cproject new file mode 100644 index 0000000..f915bd4 --- /dev/null +++ b/samples/android/face-detection/.cproject @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/face-detection/.project b/samples/android/face-detection/.project index 11b7832..9138486 100644 --- a/samples/android/face-detection/.project +++ b/samples/android/face-detection/.project @@ -6,6 +6,64 @@ + org.eclipse.cdt.managedbuilder.core.genmakebuilder + auto,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + ${NDKROOT}/ndk-build.cmd + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + true + + + org.eclipse.cdt.make.core.enableCleanBuild + false + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder @@ -25,9 +83,19 @@ + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature diff --git a/samples/android/tutorial-3-native/.cproject b/samples/android/tutorial-3-native/.cproject new file mode 100644 index 0000000..d82fb3e --- /dev/null +++ b/samples/android/tutorial-3-native/.cproject @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/tutorial-3-native/.project b/samples/android/tutorial-3-native/.project index 9c47446..c6ba8d1 100644 --- a/samples/android/tutorial-3-native/.project +++ b/samples/android/tutorial-3-native/.project @@ -6,6 +6,64 @@ + org.eclipse.cdt.managedbuilder.core.genmakebuilder + auto,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + ${NDKROOT}/ndk-build.cmd + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + true + + + org.eclipse.cdt.make.core.enableCleanBuild + false + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder @@ -25,9 +83,19 @@ + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature diff --git a/samples/android/tutorial-4-mixed/.cproject b/samples/android/tutorial-4-mixed/.cproject new file mode 100644 index 0000000..ca5bdb6 --- /dev/null +++ b/samples/android/tutorial-4-mixed/.cproject @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-4-mixed/.project index 52fff84..f7482e3 100644 --- a/samples/android/tutorial-4-mixed/.project +++ b/samples/android/tutorial-4-mixed/.project @@ -6,6 +6,64 @@ + org.eclipse.cdt.managedbuilder.core.genmakebuilder + auto,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + ${NDKROOT}/ndk-build.cmd + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + true + + + org.eclipse.cdt.make.core.enableCleanBuild + false + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder @@ -25,9 +83,19 @@ + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature -- 2.7.4