fix x86 and other arch incompatibility issues. bump to v0.0.9

TGIO · Jun 17, 2017 · 5209f10 · 5209f10
1 parent acb46c9
commit 5209f10
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Android JNI model implementation of Rob Napier's RNCryptor.
 
 ```gradle
 dependencies {
-    compile 'com.github.tgio:rncryptor-native:0.0.8'
+    compile 'com.github.tgio:rncryptor-native:0.0.9'
 }
 ```
 

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -27,7 +27,8 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.github.tgio:rncryptor-native:0.0.8'
+    compile 'com.github.tgio:rncryptor-native:0.0.9'
+//    compile project(':rncryptor-native')
     compile project(':jncryptor')
     compile 'com.github.PhilJay:MPAndroidChart:v2.2.4'
 }
diff --git a/rncryptor-native/build.gradle b/rncryptor-native/build.gradle
@@ -1,11 +1,8 @@
 apply plugin: 'com.android.model.library'
 
-def version = 8;
+def version = 9;
 
 ext {
-
-
-
     bintrayRepo = 'maven'
     bintrayName = 'rncryptor-native'
 
@@ -29,7 +26,6 @@ ext {
     allLicenses = ["Apache-2.0"]
 }
 
-
 model {
     android {
         compileSdkVersion = 25
@@ -49,7 +45,7 @@ model {
         ndk {
             moduleName = 'rncrypto'
             cppFlags.addAll(['-frtti', '-fexceptions'])
-            ldLibs.add("log")
+            ldLibs.addAll(['android', 'log'])
             stl "gnustl_shared"
         }
         sources {
@@ -84,8 +80,6 @@ model {
         }
     }
 
-
-
 }
 
 

diff --git a/rncryptor-native/src/main/jniLibs/arm64-v8a/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/arm64-v8a/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/armeabi-v7a/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/armeabi-v7a/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/armeabi/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/armeabi/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/mips/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/mips/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/mips64/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/mips64/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/x86/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/x86/libgnustl_shared.so
diff --git a/rncryptor-native/src/main/jniLibs/x86_64/libgnustl_shared.so b/rncryptor-native/src/main/jniLibs/x86_64/libgnustl_shared.so