Commit ea886093 authored by Mygod's avatar Mygod

Ensure cargoBuild is ran before mergeJniLibFolders

parent 3396078b
...@@ -54,6 +54,7 @@ fun Project.setupCore() { ...@@ -54,6 +54,7 @@ fun Project.setupCore() {
versionName = "5.0.6-nightly" versionName = "5.0.6-nightly"
} }
compileOptions.isCoreLibraryDesugaringEnabled = true compileOptions.isCoreLibraryDesugaringEnabled = true
ndkVersion = "21.1.6352462"
} }
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.0.5") dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.0.5")
} }
......
...@@ -26,7 +26,6 @@ android { ...@@ -26,7 +26,6 @@ android {
} }
externalNativeBuild.ndkBuild.path("src/main/jni/Android.mk") externalNativeBuild.ndkBuild.path("src/main/jni/Android.mk")
ndkVersion = "21.1.6352462"
sourceSets.getByName("androidTest") { sourceSets.getByName("androidTest") {
assets.setSrcDirs(assets.srcDirs + files("$projectDir/schemas")) assets.setSrcDirs(assets.srcDirs + files("$projectDir/schemas"))
...@@ -58,7 +57,7 @@ cargo { ...@@ -58,7 +57,7 @@ cargo {
tasks.whenTaskAdded { tasks.whenTaskAdded {
when (name) { when (name) {
"javaPreCompileDebug", "javaPreCompileRelease" -> dependsOn("cargoBuild") "mergeDebugJniLibFolders", "mergeReleaseJniLibFolders" -> dependsOn("cargoBuild")
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment