* Add Android utility classes from the official Java API of OpenCV (…

…issue #549)
bytedeco · Apr 7, 2018 · bf18466 · bf18466
1 parent 5031598
commit bf18466
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Add Android utility classes from the official Java API of OpenCV ([issue #549](https://github.com/bytedeco/javacpp-presets/issues/549))
+ * Update build for FFmpeg on Raspbian Stretch ([pull #548](https://github.com/bytedeco/javacpp-presets/pull/548))
  * Add presets for TensorRT
  * Fix build for FFmpeg on `android-x86` and `android-x86_64` platforms ([issue bytedeco/javacv#945](https://github.com/bytedeco/javacv/issues/945))
  * Upgrade presets for TensorFlow 1.7.0

diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh
@@ -190,5 +190,10 @@ case $PLATFORM in
 esac
 
 cp -r modules/java_bindings_generator/gen/java ..
+cp -r modules/java_bindings_generator/gen/android/java ..
+rm ../java/org/opencv/android/AsyncServiceHelper.java
+rm ../java/org/opencv/android/CameraBridgeViewBase.java
+rm ../java/org/opencv/android/JavaCameraView.java
+rm ../java/org/opencv/android/OpenCVLoader.java
 
 cd ../..
diff --git a/opencv/pom.xml b/opencv/pom.xml
@@ -19,6 +19,18 @@
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <version>4.1.1.4</version>
+      <exclusions>
+        <exclusion>
+            <groupId>*</groupId>
+            <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>