diff --git a/app/build.gradle b/app/build.gradle index c1a36d93..76d6a244 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,12 @@ android { aaptOptions { noCompress "tflite" } + sourceSets { + main { + jniLibs.srcDirs = ['libs'] + assets.srcDir("main/assets") + } + } } dependencies { diff --git a/nsfw/build.gradle b/nsfw/build.gradle index 3c9bc00f..53dbded2 100644 --- a/nsfw/build.gradle +++ b/nsfw/build.gradle @@ -16,9 +16,9 @@ android { cppFlags "-frtti -fexceptions" } } - ndk { - abiFilters 'armeabi-v7a' - } +// ndk { +// abiFilters 'armeabi-v7a' +// } } buildTypes { diff --git a/nsfw/libs/armeabi-v7a/libopencv_calib3d.a b/nsfw/libs/armeabi-v7a/libopencv_calib3d.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_core.a b/nsfw/libs/armeabi-v7a/libopencv_core.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_dnn.a b/nsfw/libs/armeabi-v7a/libopencv_dnn.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_features2d.a b/nsfw/libs/armeabi-v7a/libopencv_features2d.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_flann.a b/nsfw/libs/armeabi-v7a/libopencv_flann.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_highgui.a b/nsfw/libs/armeabi-v7a/libopencv_highgui.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a b/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgproc.a b/nsfw/libs/armeabi-v7a/libopencv_imgproc.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_java3.so b/nsfw/libs/armeabi-v7a/libopencv_java3.so deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_ml.a b/nsfw/libs/armeabi-v7a/libopencv_ml.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_objdetect.a b/nsfw/libs/armeabi-v7a/libopencv_objdetect.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_photo.a b/nsfw/libs/armeabi-v7a/libopencv_photo.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_shape.a b/nsfw/libs/armeabi-v7a/libopencv_shape.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_stitching.a b/nsfw/libs/armeabi-v7a/libopencv_stitching.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_superres.a b/nsfw/libs/armeabi-v7a/libopencv_superres.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_video.a b/nsfw/libs/armeabi-v7a/libopencv_video.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_videoio.a b/nsfw/libs/armeabi-v7a/libopencv_videoio.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/libs/armeabi-v7a/libopencv_videostab.a b/nsfw/libs/armeabi-v7a/libopencv_videostab.a deleted file mode 100644 index e69de29b..00000000 diff --git a/nsfw/src/main/java/com/zwy/nsfw/Classifier.java b/nsfw/src/main/java/com/zwy/nsfw/Classifier.java index 5553cdb3..f47102be 100644 --- a/nsfw/src/main/java/com/zwy/nsfw/Classifier.java +++ b/nsfw/src/main/java/com/zwy/nsfw/Classifier.java @@ -106,7 +106,11 @@ public abstract class Classifier { * DIM_PIXEL_SIZE * getNumBytesPerChannel()); imgData.order(ByteOrder.LITTLE_ENDIAN); - OpenCVLoader.initDebug(); + if (OpenCVLoader.initDebug()){ + Log.d(TAG, "OpenCv Initialization Success."); + }else { + Log.e(TAG, "OpenCv Initialization Error."); + } Log.d(TAG, "Tensorflow Lite Image Classifier Initialization Success."); } diff --git a/openCVLibrary340/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt b/openCVLibrary340/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/openCVLibrary340/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar b/openCVLibrary340/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar index a4b81ec4..7b2d5339 100644 Binary files a/openCVLibrary340/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar and b/openCVLibrary340/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar differ diff --git a/openCVLibrary340/build/intermediates/full_jar/debug/createFullJarDebug/full.jar b/openCVLibrary340/build/intermediates/full_jar/debug/createFullJarDebug/full.jar deleted file mode 100644 index a4fef906..00000000 Binary files a/openCVLibrary340/build/intermediates/full_jar/debug/createFullJarDebug/full.jar and /dev/null differ diff --git a/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state deleted file mode 100644 index 44bc7466..00000000 Binary files a/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ diff --git a/openCVLibrary340/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/openCVLibrary340/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index 0ecde69e..cc168e05 100644 --- a/openCVLibrary340/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/openCVLibrary340/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Mon May 20 14:42:33 CST 2019 +#Mon May 20 15:37:48 CST 2019 diff --git a/openCVLibrary340/build/intermediates/packaged-classes/debug/classes.jar b/openCVLibrary340/build/intermediates/packaged-classes/debug/classes.jar deleted file mode 100644 index a4fef906..00000000 Binary files a/openCVLibrary340/build/intermediates/packaged-classes/debug/classes.jar and /dev/null differ diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar deleted file mode 100644 index 15cb0ecb..00000000 Binary files a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar and /dev/null differ diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json deleted file mode 100644 index a6c7c939..00000000 --- a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}] \ No newline at end of file diff --git a/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar b/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar deleted file mode 100644 index 9673e446..00000000 Binary files a/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar and /dev/null differ