Added provided .so files and added NDK check into gradle script

mangalarora · May 11, 2018 · 41cbbf2 · 41cbbf2
1 parent 4cfbc04
commit 41cbbf2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/app/libs/armeabi/libtool-checker.so b/app/libs/armeabi/libtool-checker.so
diff --git a/rootbeerlib/build.gradle b/rootbeerlib/build.gradle
@@ -18,10 +18,32 @@ android {
         }
     }
 
-    externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
+    // Perform a check to see if the NDK exists
+    if (android.getNdkDirectory().exists()){
+        // If it does, perform compilation
+        logger.debug("Found NDK"+android.getNdkDirectory())
+
+        externalNativeBuild {
+            ndkBuild {
+                path 'src/main/jni/Android.mk'
+            }
         }
+
+    }
+    else{
+        //Otherwise disable automatic ndk-build and use pre-compiled .so files
+        logger.debug("NDK Not Present"+android.getNdkDirectory())
+
+        sourceSets {
+            main {
+                jni.srcDirs = []
+            }
+        }
+    }
+
+    packagingOptions {
+        // In case there are both compiled .so files and provided .so files, pick the first (should be generated)
+        pickFirst('lib/*/libtool-checker.so')
     }
 }
 

diff --git a/rootbeerlib/src/main/jniLibs/arm64-v8a/libtool-checker.so b/rootbeerlib/src/main/jniLibs/arm64-v8a/libtool-checker.so
diff --git a/rootbeerlib/src/main/jniLibs/armeabi-v7a/libtool-checker.so b/rootbeerlib/src/main/jniLibs/armeabi-v7a/libtool-checker.so
diff --git a/rootbeerlib/src/main/jniLibs/x86/libtool-checker.so b/rootbeerlib/src/main/jniLibs/x86/libtool-checker.so
diff --git a/rootbeerlib/src/main/jniLibs/x86_64/libtool-checker.so b/rootbeerlib/src/main/jniLibs/x86_64/libtool-checker.so