diff options
| author | Albin <albin@mullvad.net> | 2022-03-14 21:28:35 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-03-14 21:28:35 +0100 |
| commit | 6312a3037ed6e72db3e07c62f2b13ae4b8f0a706 (patch) | |
| tree | ea35f6f8fa2695f03e1a80cd41e17a88c342e099 | |
| parent | 4ab205bd9add69264ccdfaaf8cf068515ceddb77 (diff) | |
| parent | 60c8db1fbe09572079620a6197992c4c03035e90 (diff) | |
| download | mullvadvpn-6312a3037ed6e72db3e07c62f2b13ae4b8f0a706.tar.xz mullvadvpn-6312a3037ed6e72db3e07c62f2b13ae4b8f0a706.zip | |
Merge branch 'ensure-jni-directory-exists-during-build'
| -rw-r--r-- | android/app/build.gradle.kts | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index dd7d97d1ec..54b2b96643 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,3 +1,4 @@ +import com.android.build.gradle.internal.tasks.factory.dependsOn import java.io.FileInputStream import java.util.Properties import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -104,6 +105,8 @@ android { } } } + + project.tasks.preBuild.dependsOn("ensureJniDirectoryExist") } configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> { @@ -131,6 +134,14 @@ tasks.register("copyExtraAssets", Copy::class) { into(extraAssetsDirectory) } +tasks.register("ensureJniDirectoryExist") { + doFirst { + if (!file(extraJniDirectory).exists()) { + throw GradleException("Missing JNI directory: $extraJniDirectory") + } + } +} + play { serviceAccountCredentials = file("play-api-key.json") } |
