Add workround from this issue:

bytedeco/javacpp-presets#220 bytedeco/javacv#395 Thanks to Samuel @saudet
talregev · May 21, 2016 · e0519a7 · e0519a7
1 parent 5070c49
commit e0519a7
Show file tree

Hide file tree

Showing 44 changed files with 6 additions and 1 deletion.
diff --git 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
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_calib3d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_calib3d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_core.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_core.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_dnn.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_dnn.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_face.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_face.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_features2d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_features2d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_flann.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_flann.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_highgui.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_highgui.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgcodecs.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_imgcodecs.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_imgproc.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_imgproc.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_ml.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_ml.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_objdetect.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_objdetect.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_optflow.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_optflow.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_photo.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_photo.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_shape.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_shape.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_stitching.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_stitching.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_superres.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_superres.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_video.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_video.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_videoio.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_videoio.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_videostab.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_videostab.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_xfeatures2d.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_xfeatures2d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libjniopencv_ximgproc.so b/cv_bridge_native/res/lib/armeabi/libjniopencv_ximgproc.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_calib3d.so b/cv_bridge_native/res/lib/armeabi/libopencv_calib3d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_core.so b/cv_bridge_native/res/lib/armeabi/libopencv_core.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_dnn.so b/cv_bridge_native/res/lib/armeabi/libopencv_dnn.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_face.so b/cv_bridge_native/res/lib/armeabi/libopencv_face.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_features2d.so b/cv_bridge_native/res/lib/armeabi/libopencv_features2d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_flann.so b/cv_bridge_native/res/lib/armeabi/libopencv_flann.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_highgui.so b/cv_bridge_native/res/lib/armeabi/libopencv_highgui.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_imgcodecs.so b/cv_bridge_native/res/lib/armeabi/libopencv_imgcodecs.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_imgproc.so b/cv_bridge_native/res/lib/armeabi/libopencv_imgproc.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_ml.so b/cv_bridge_native/res/lib/armeabi/libopencv_ml.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_objdetect.so b/cv_bridge_native/res/lib/armeabi/libopencv_objdetect.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_optflow.so b/cv_bridge_native/res/lib/armeabi/libopencv_optflow.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_photo.so b/cv_bridge_native/res/lib/armeabi/libopencv_photo.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_shape.so b/cv_bridge_native/res/lib/armeabi/libopencv_shape.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_stitching.so b/cv_bridge_native/res/lib/armeabi/libopencv_stitching.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_superres.so b/cv_bridge_native/res/lib/armeabi/libopencv_superres.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_video.so b/cv_bridge_native/res/lib/armeabi/libopencv_video.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_videoio.so b/cv_bridge_native/res/lib/armeabi/libopencv_videoio.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_videostab.so b/cv_bridge_native/res/lib/armeabi/libopencv_videostab.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_xfeatures2d.so b/cv_bridge_native/res/lib/armeabi/libopencv_xfeatures2d.so
diff --git a/cv_bridge_native/res/lib/armeabi/libopencv_ximgproc.so b/cv_bridge_native/res/lib/armeabi/libopencv_ximgproc.so