Android support for new native masterpassword-core.

platform-android/build.gradle

@@ -4,11 +4,6 @@ android {
     compileSdkVersion 25
     buildToolsVersion '27.0.3'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId 'com.lyndir.masterpassword'
         minSdkVersion 19
@@ -16,6 +11,21 @@ android {
         versionCode 20501
         versionName '2.5.1'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    externalNativeBuild {
+        cmake {
+            path 'CMakeLists.txt'
+        }
+    }
+    sourceSets {
+        main {
+            jniLibs.srcDirs "$projectDir/../lib/libsodium/build-android~/out/lib",
+                            "$projectDir/../lib/libjson-c/build-android~/out/lib"
+        }
+    }
 
     // release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW_ANDROID=$(mpw masterpassword-android) gradle masterpassword-android:assembleRelease
     signingConfigs {
@@ -43,3 +53,13 @@ dependencies {
     implementation group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
     annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '8.5.1'
 }
+
+preBuild {
+    dependsOn task( type: Exec, 'buildLibSodium', {
+        commandLine "$projectDir/../lib/bin/build_libsodium-android"
+    } )
+    dependsOn task( type: Exec, 'buildLibJson-c', {
+        commandLine "$projectDir/../lib/bin/build_libjson-c-android"
+    } )
+}
+