diff --git a/app/build.gradle b/app/build.gradle
index c216362b7..a5a431db7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,6 +13,9 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ ndk {
+ abiFilters 'armeabi-v7a'
+ }
}
buildTypes {
debug{
@@ -34,6 +37,6 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
- implementation project(path: ':nsfw')
-// implementation 'com.github.devzwy:open_nsfw_android:1.2.1'
+// implementation project(path: ':nsfw')
+ implementation 'com.github.devzwy:open_nsfw_android:1.2.1.2'
}
diff --git a/app/debug/output.json b/app/debug/output.json
new file mode 100644
index 000000000..92a078474
--- /dev/null
+++ b/app/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
\ No newline at end of file
diff --git a/nsfw/build.gradle b/nsfw/build.gradle
index 5bd657a2b..3c9bc00f1 100644
--- a/nsfw/build.gradle
+++ b/nsfw/build.gradle
@@ -17,10 +17,6 @@ android {
}
}
ndk {
-
- // Specifies the ABI configurations of your native
- // libraries Gradle should build and package with your APK.
-// abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'mips64'
abiFilters 'armeabi-v7a'
}
}
diff --git a/nsfw/libs/armeabi-v7a/libopencv_calib3d.a b/nsfw/libs/armeabi-v7a/libopencv_calib3d.a
index bb174dae0..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_calib3d.a and b/nsfw/libs/armeabi-v7a/libopencv_calib3d.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_core.a b/nsfw/libs/armeabi-v7a/libopencv_core.a
index cf6416318..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_core.a and b/nsfw/libs/armeabi-v7a/libopencv_core.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_dnn.a b/nsfw/libs/armeabi-v7a/libopencv_dnn.a
index 683825307..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_dnn.a and b/nsfw/libs/armeabi-v7a/libopencv_dnn.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_features2d.a b/nsfw/libs/armeabi-v7a/libopencv_features2d.a
index c2f994a0f..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_features2d.a and b/nsfw/libs/armeabi-v7a/libopencv_features2d.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_flann.a b/nsfw/libs/armeabi-v7a/libopencv_flann.a
index af1568654..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_flann.a and b/nsfw/libs/armeabi-v7a/libopencv_flann.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_highgui.a b/nsfw/libs/armeabi-v7a/libopencv_highgui.a
index b32e65646..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_highgui.a and b/nsfw/libs/armeabi-v7a/libopencv_highgui.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a b/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a
index 182fe41c2..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a and b/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgproc.a b/nsfw/libs/armeabi-v7a/libopencv_imgproc.a
index 97cfef848..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_imgproc.a and b/nsfw/libs/armeabi-v7a/libopencv_imgproc.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_java3.so b/nsfw/libs/armeabi-v7a/libopencv_java3.so
index 371a92e43..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_java3.so and b/nsfw/libs/armeabi-v7a/libopencv_java3.so differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_ml.a b/nsfw/libs/armeabi-v7a/libopencv_ml.a
index debdcb05e..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_ml.a and b/nsfw/libs/armeabi-v7a/libopencv_ml.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_objdetect.a b/nsfw/libs/armeabi-v7a/libopencv_objdetect.a
index 6ad3a8911..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_objdetect.a and b/nsfw/libs/armeabi-v7a/libopencv_objdetect.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_photo.a b/nsfw/libs/armeabi-v7a/libopencv_photo.a
index e4b67b92d..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_photo.a and b/nsfw/libs/armeabi-v7a/libopencv_photo.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_shape.a b/nsfw/libs/armeabi-v7a/libopencv_shape.a
index e1a380d44..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_shape.a and b/nsfw/libs/armeabi-v7a/libopencv_shape.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_stitching.a b/nsfw/libs/armeabi-v7a/libopencv_stitching.a
index 4f3bfe782..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_stitching.a and b/nsfw/libs/armeabi-v7a/libopencv_stitching.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_superres.a b/nsfw/libs/armeabi-v7a/libopencv_superres.a
index c0f2ae0a4..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_superres.a and b/nsfw/libs/armeabi-v7a/libopencv_superres.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_video.a b/nsfw/libs/armeabi-v7a/libopencv_video.a
index 5944f0204..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_video.a and b/nsfw/libs/armeabi-v7a/libopencv_video.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_videoio.a b/nsfw/libs/armeabi-v7a/libopencv_videoio.a
index 44887a274..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_videoio.a and b/nsfw/libs/armeabi-v7a/libopencv_videoio.a differ
diff --git a/nsfw/libs/armeabi-v7a/libopencv_videostab.a b/nsfw/libs/armeabi-v7a/libopencv_videostab.a
index 00501db6d..e69de29bb 100644
Binary files a/nsfw/libs/armeabi-v7a/libopencv_videostab.a and b/nsfw/libs/armeabi-v7a/libopencv_videostab.a differ
diff --git a/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state
new file mode 100644
index 000000000..44bc74660
Binary files /dev/null and b/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar
new file mode 100644
index 000000000..15cb0ecb3
Binary files /dev/null and b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar differ
diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json
new file mode 100644
index 000000000..a6c7c939d
--- /dev/null
+++ b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json
@@ -0,0 +1 @@
+[{"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
new file mode 100644
index 000000000..9673e4466
Binary files /dev/null and b/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar differ