Merge branch 'main' into 2027

shared/config.gradle

@@ -38,12 +38,14 @@ nativeUtils.platformConfigs.each {
     }
 }
 
-// Compress debug info on Linux
 nativeUtils.platformConfigs.each {
   if (it.name.contains('linux')) {
+    // Compress debug info on Linux
     it.cppCompiler.debugArgs.add("-gz=zlib")
     // Make warning in OpenCV 4.10 from GCC 15 not an error
     it.cppCompiler.args.add("-Wno-error=overloaded-virtual")
+    // Make warning from Google Benchmark not an error
+    it.cppCompiler.args.add("-Wno-error=restrict")
   }
 }
 

shared/jni/setupBuild.gradle

@@ -149,7 +149,11 @@ model {
         // By default, a development executable will be generated. This is to help the case of
         // testing specific functionality of the library.
         "${nativeName}Dev"(NativeExecutableSpec) {
-            targetBuildTypes 'debug'
+            if (project.hasProperty('ciDebugOnly') || project.hasProperty('debugJNI')) {
+                targetBuildTypes 'debug'
+            } else {
+                targetBuildTypes 'release'
+            }
             sources {
                 cpp {
                     source {