abiFilters 'armeabi-v7a'

Arryboom · May 20, 2019 · 596d36a · 596d36a
1 parent 41c1a2d
commit 596d36a
Show file tree

Hide file tree

Showing 25 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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":{}}]
diff --git 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
diff --git a/nsfw/libs/armeabi-v7a/libopencv_core.a b/nsfw/libs/armeabi-v7a/libopencv_core.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_dnn.a b/nsfw/libs/armeabi-v7a/libopencv_dnn.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_features2d.a b/nsfw/libs/armeabi-v7a/libopencv_features2d.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_flann.a b/nsfw/libs/armeabi-v7a/libopencv_flann.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_highgui.a b/nsfw/libs/armeabi-v7a/libopencv_highgui.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a b/nsfw/libs/armeabi-v7a/libopencv_imgcodecs.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_imgproc.a b/nsfw/libs/armeabi-v7a/libopencv_imgproc.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_java3.so b/nsfw/libs/armeabi-v7a/libopencv_java3.so
diff --git a/nsfw/libs/armeabi-v7a/libopencv_ml.a b/nsfw/libs/armeabi-v7a/libopencv_ml.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_objdetect.a b/nsfw/libs/armeabi-v7a/libopencv_objdetect.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_photo.a b/nsfw/libs/armeabi-v7a/libopencv_photo.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_shape.a b/nsfw/libs/armeabi-v7a/libopencv_shape.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_stitching.a b/nsfw/libs/armeabi-v7a/libopencv_stitching.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_superres.a b/nsfw/libs/armeabi-v7a/libopencv_superres.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_video.a b/nsfw/libs/armeabi-v7a/libopencv_video.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_videoio.a b/nsfw/libs/armeabi-v7a/libopencv_videoio.a
diff --git a/nsfw/libs/armeabi-v7a/libopencv_videostab.a b/nsfw/libs/armeabi-v7a/libopencv_videostab.a
diff --git a/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/openCVLibrary340/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/0.jar
diff --git a/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json b/openCVLibrary340/build/intermediates/transforms/mergeJavaRes/debug/__content__.json
@@ -0,0 +1 @@
+[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
diff --git a/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar b/openCVLibrary340/build/outputs/aar/openCVLibrary340-debug.aar
Original file line number	Diff line number	Diff line change
		@@ -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":{}}]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]