diff --git a/build.gradle b/build.gradle index 4e35d7f..786d391 100644 --- a/build.gradle +++ b/build.gradle @@ -118,9 +118,14 @@ subprojects { // Exclude a few files that are duplicated across our dependencies and // prevent packaging Android applications. packagingOptions { - /* https://github.com/rosjava/android_core/issues/194 */ + //from https://github.com/rosjava/android_core/issues/194 exclude "META-INF/LICENSE.txt" exclude "META-INF/NOTICE.txt" + + //from https://github.com/bytedeco/javacpp-presets/issues/220 + exclude 'META-INF/services/javax.annotation.processing.Processor' + pickFirst 'META-INF/maven/org.bytedeco.javacpp-presets/opencv/pom.properties' + pickFirst 'META-INF/maven/org.bytedeco.javacpp-presets/opencv/pom.xml' } } } diff --git a/cv_bridge_native/res/lib/armeabi/libjnicvkernels.so b/cv_bridge_native/res/lib/armeabi/libjnicvkernels.so deleted file mode 100644 index e4b84ff..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjnicvkernels.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_calib3d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_calib3d.so deleted file mode 100644 index 0f32be3..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_calib3d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_core.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_core.so deleted file mode 100644 index 83334c3..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_core.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_dnn.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_dnn.so deleted file mode 100644 index c163cdc..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_dnn.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_face.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_face.so deleted file mode 100644 index 44f4a8b..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_face.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_features2d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_features2d.so deleted file mode 100644 index db977db..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_features2d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_flann.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_flann.so deleted file mode 100644 index fde0ed9..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_flann.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_highgui.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_highgui.so deleted file mode 100644 index 9de0dc6..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_highgui.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgcodecs.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_imgcodecs.so deleted file mode 100644 index 6ac74a9..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgcodecs.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgproc.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_imgproc.so deleted file mode 100644 index c6901a2..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgproc.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_ml.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_ml.so deleted file mode 100644 index 70ff08e..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_ml.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_objdetect.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_objdetect.so deleted file mode 100644 index baa87c3..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_objdetect.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_optflow.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_optflow.so deleted file mode 100644 index 3d6b8af..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_optflow.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_photo.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_photo.so deleted file mode 100644 index b651654..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_photo.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_shape.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_shape.so deleted file mode 100644 index a8fa0ee..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_shape.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_stitching.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_stitching.so deleted file mode 100644 index 5432256..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_stitching.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_superres.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_superres.so deleted file mode 100644 index cc3564c..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_superres.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_video.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_video.so deleted file mode 100644 index ce32bef..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_video.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_videoio.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_videoio.so deleted file mode 100644 index 56e60ef..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_videoio.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_videostab.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_videostab.so deleted file mode 100644 index 5beef99..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_videostab.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_xfeatures2d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_xfeatures2d.so deleted file mode 100644 index 779edb8..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_xfeatures2d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_ximgproc.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_ximgproc.so deleted file mode 100644 index c6b85db..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libjniopencv_ximgproc.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_calib3d.so b/cv_bridge_native/res/lib/armeabi/libopencv_calib3d.so deleted file mode 100644 index 6335f80..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_calib3d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_core.so b/cv_bridge_native/res/lib/armeabi/libopencv_core.so deleted file mode 100644 index dbe8d63..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_core.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_dnn.so b/cv_bridge_native/res/lib/armeabi/libopencv_dnn.so deleted file mode 100644 index c0a4b47..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_dnn.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_face.so b/cv_bridge_native/res/lib/armeabi/libopencv_face.so deleted file mode 100644 index cd7aa74..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_face.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_features2d.so b/cv_bridge_native/res/lib/armeabi/libopencv_features2d.so deleted file mode 100644 index 5b3c87c..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_features2d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_flann.so b/cv_bridge_native/res/lib/armeabi/libopencv_flann.so deleted file mode 100644 index 12e5560..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_flann.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_highgui.so b/cv_bridge_native/res/lib/armeabi/libopencv_highgui.so deleted file mode 100644 index 35e9566..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_highgui.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_imgcodecs.so b/cv_bridge_native/res/lib/armeabi/libopencv_imgcodecs.so deleted file mode 100644 index ab6410d..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_imgcodecs.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_imgproc.so b/cv_bridge_native/res/lib/armeabi/libopencv_imgproc.so deleted file mode 100644 index 21e185f..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_imgproc.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_ml.so b/cv_bridge_native/res/lib/armeabi/libopencv_ml.so deleted file mode 100644 index bed6d9b..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_ml.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_objdetect.so b/cv_bridge_native/res/lib/armeabi/libopencv_objdetect.so deleted file mode 100644 index c5587a0..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_objdetect.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_optflow.so b/cv_bridge_native/res/lib/armeabi/libopencv_optflow.so deleted file mode 100644 index a7f6cbb..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_optflow.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_photo.so b/cv_bridge_native/res/lib/armeabi/libopencv_photo.so deleted file mode 100644 index cf6b139..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_photo.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_shape.so b/cv_bridge_native/res/lib/armeabi/libopencv_shape.so deleted file mode 100644 index ecb0e91..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_shape.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_stitching.so b/cv_bridge_native/res/lib/armeabi/libopencv_stitching.so deleted file mode 100644 index 1d35ae5..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_stitching.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_superres.so b/cv_bridge_native/res/lib/armeabi/libopencv_superres.so deleted file mode 100644 index 5afe028..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_superres.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_video.so b/cv_bridge_native/res/lib/armeabi/libopencv_video.so deleted file mode 100644 index 69b91c0..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_video.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_videoio.so b/cv_bridge_native/res/lib/armeabi/libopencv_videoio.so deleted file mode 100644 index 2bb47b6..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_videoio.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_videostab.so b/cv_bridge_native/res/lib/armeabi/libopencv_videostab.so deleted file mode 100644 index 0257d06..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_videostab.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_xfeatures2d.so b/cv_bridge_native/res/lib/armeabi/libopencv_xfeatures2d.so deleted file mode 100644 index 357d400..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_xfeatures2d.so and /dev/null differ diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_ximgproc.so b/cv_bridge_native/res/lib/armeabi/libopencv_ximgproc.so deleted file mode 100644 index 3a1f08c..0000000 Binary files a/cv_bridge_native/res/lib/armeabi/libopencv_ximgproc.so and /dev/null differ