Merge pull request pqpo#59 from z4hyoung/master

Support arm64-v8a library
freeblow · Dec 7, 2018 · bd2be58 · bd2be58
2 parents 75876f7 + a61e0cf
commit bd2be58
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 28
     defaultConfig {
         applicationId "me.pqpo.smartcropper"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode 2
         versionName "1.1"
         ndk {
-            abiFilters 'armeabi','armeabi-v7a'
+            abiFilters 'armeabi-v7a', "arm64-v8a", 'x86'
         }
     }
     buildTypes {

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
     }
@@ -14,6 +15,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         maven { url 'https://jitpack.io' }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 02 17:15:10 CST 2017
+#Tue Dec 04 13:45:12 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/smartcropperlib/build.gradle b/smartcropperlib/build.gradle
@@ -3,19 +3,18 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.pqpo'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 8
         versionName "1.2.3"
 
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -frtti -fexceptions -lz"
-                abiFilters 'armeabi-v7a', 'x86'
+                abiFilters 'armeabi-v7a', "arm64-v8a", 'x86'
                 arguments '-DANDROID_STL=gnustl_shared'
             }
         }

diff --git a/smartcropperlib/opencv/lib/arm64-v8a/libopencv_core.a b/smartcropperlib/opencv/lib/arm64-v8a/libopencv_core.a
diff --git a/smartcropperlib/opencv/lib/arm64-v8a/libopencv_imgproc.a b/smartcropperlib/opencv/lib/arm64-v8a/libopencv_imgproc.a
diff --git a/smartcropperlib/opencv/lib/arm64-v8a/libtbb.a b/smartcropperlib/opencv/lib/arm64-v8a/libtbb.a