Merge pull request #6691 from alalek:cmake_fix_android_samples_2.4

dafb4b81 · Alexander Alekhin · aa861520 · c6be51ee · dafb4b81
Commit dafb4b81 authored Jun 16, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OpenCVDetectAndroidSDK.cmake cmake/OpenCVDetectAndroidSDK.cmake +1 -1

No files found.
--- a/cmake/OpenCVDetectAndroidSDK.cmake
+++ b/cmake/OpenCVDetectAndroidSDK.cmake
@@ -290,7 +290,7 @@ macro(add_android_project target path)
          set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android)
        endif()

-        add_library(${JNI_LIB_NAME} MODULE ${android_proj_jni_files})
+        add_library(${JNI_LIB_NAME} SHARED ${android_proj_jni_files})
        target_link_libraries(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_proj_NATIVE_DEPS})

        set_target_properties(${JNI_LIB_NAME} PROPERTIES