android: update 'debug' information support

modules/java/android_sdk/android_gradle_lib/build.gradle

@@ -11,11 +11,14 @@ android {
 
     buildTypes {
         debug {
-            packagingOptions{
-                doNotStrip '*.so'
+            packagingOptions {
+                doNotStrip '**/*.so'  // controlled by OpenCV CMake scripts
             }
         }
         release {
+            packagingOptions {
+                doNotStrip '**/*.so'  // controlled by OpenCV CMake scripts
+            }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }

modules/java/android_sdk/build.gradle.in

@@ -102,7 +102,15 @@ android {
     }
 
     buildTypes {
+        debug {
+            packagingOptions {
+                doNotStrip '**/*.so'  // controlled by OpenCV CMake scripts
+            }
+        }
         release {
+            packagingOptions {
+                doNotStrip '**/*.so'  // controlled by OpenCV CMake scripts
+            }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }

modules/java/jni/CMakeLists.txt

@@ -77,7 +77,7 @@ if(ANDROID)
 
   # force strip library after the build command
   # because samples and tests will make a copy of the library before install
-  if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  if(NOT BUILD_WITH_DEBUG_INFO AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
     add_custom_command(TARGET ${the_module} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "$<TARGET_FILE:${the_module}>")
   endif()
 endif()