Reenable android support through compiled libraries

Author: Sese-Schneider

android/CMakeLists.txt

@@ -42,7 +42,7 @@ android {
     sourceSets {
         main {
             // Bundle so files with the final apk.
-            jniLibs.srcDirs = ['../native/lib/android']
+            jniLibs.srcDirs = ['libraries']
         }
     }
 
@@ -54,11 +54,5 @@ android {
     defaultConfig {
         minSdkVersion 19
     }
-
-    externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
-        }
-    }
 }
 

android/build.gradle

@@ -35,14 +35,13 @@ class DiveComputerFfi {
       );
     });
 
-    const String libName = 'dive_computer';
     String fileName;
     if (Platform.isWindows) {
       fileName = 'libdivecomputer-0.dll';
     } else if (Platform.isAndroid) {
-      fileName = 'lib$libName.so';
+      fileName = 'libdivecomputer.so';
     } else if (Platform.isMacOS || Platform.isIOS) {
-      fileName = '$libName.framework/$libName';
+      fileName = 'dive_computer.framework/dive_computer';
     } else {
       throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}');
     }