diff options
author | Arne Schwabe <arne@openvpn.net> | 2019-02-07 17:11:01 +0100 |
---|---|---|
committer | Arne Schwabe <arne@openvpn.net> | 2019-02-07 17:11:01 +0100 |
commit | 10be307704a6d22e9f7344e6b18066626b0040dd (patch) | |
tree | 087d68d76ac60164d6186f7558e7f39aaf9df54e /main/build.gradle.kts | |
parent | 0f3032f97c14424543835f215520a714ac040ffb (diff) |
Fix building openvpn3 related files
Also remove noovpn3. I don't use it myself and don't want to spend the
time right now to fix it.
Diffstat (limited to 'main/build.gradle.kts')
-rw-r--r-- | main/build.gradle.kts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 35af282a..3c438bc4 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -42,7 +42,6 @@ dependencies { val openvpn3SwigFiles = File(buildDir, "generated/source/ovpn3swig/ovpn3") -//task ("generateOpenVPN3Swig" , Exec.class) { tasks.register<Exec>("generateOpenVPN3Swig") { var swigcmd = "swig" @@ -90,10 +89,7 @@ android { } create("normal") { -// java.srcDir(listOf(File("src/ovpn3/java/"), openvpn3SwigFiles)) - } - - create("noovpn3") { + java.srcDirs("src/ovpn3/java/", openvpn3SwigFiles) } getByName("debug") { @@ -124,10 +120,10 @@ android { flavorDimensions("implementation") productFlavors { - create("noovpn3") { + /*create("noovpn3") { setDimension("implementation") buildConfigField ("boolean", "openvpn3", "false") - } + }*/ create("normal") { setDimension("implementation") buildConfigField ("boolean", "openvpn3", "true") @@ -160,9 +156,13 @@ if (project.hasProperty("keystoreFile") && /* Hack-o-rama but it works good enough and documentation is surprisingly sparse */ val swigTask = tasks.named("generateOpenVPN3Swig") +val preBuildTask = tasks.getByName("preBuild") val assembleTask = tasks.getByName("assemble") +println(tasks.names) + assembleTask.dependsOn(swigTask) +preBuildTask.dependsOn(swigTask) // Ensure native build is run before assets, so assets are ready to be merged into the apk /*android.applicationVariants.all { variant -> |