From 856fe1174a44760090017d5e091e1cb4d57a22b0 Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Wed, 9 Jun 2021 20:37:27 +0200 Subject: [PATCH] For the F-Droid missing libgdx.so problem (#4090) --- android/build.gradle.kts | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index ca767799e7..8dc55b5fd2 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -77,21 +77,11 @@ task("copyAndroidNatives") { val natives: Configuration by configurations doFirst { - file("libs/armeabi/").mkdirs() - file("libs/armeabi-v7a/").mkdirs() - file("libs/arm64-v8a/").mkdirs() - file("libs/x86_64/").mkdirs() - file("libs/x86/").mkdirs() + val rx = Regex(""".*natives-([^.]+)\.jar$""") natives.forEach { jar -> - val outputDir: File? = when { - jar.name.endsWith("natives-arm64-v8a.jar") -> file("libs/arm64-v8a") - jar.name.endsWith("natives-armeabi-v7a.jar") -> file("libs/armeabi-v7a") - jar.name.endsWith("natives-armeabi.jar") -> file("libs/armeabi") - jar.name.endsWith("natives-x86_64.jar") -> file("libs/x86_64") - jar.name.endsWith("natives-x86.jar") -> file("libs/x86") - else -> null - } - outputDir?.let { + if (rx.matches(jar.name)) { + val outputDir = file(rx.replace(jar.name) { "libs/" + it.groups[1]!!.value }) + outputDir.mkdirs() copy { from(zipTree(jar)) into(outputDir) @@ -103,7 +93,7 @@ task("copyAndroidNatives") { } tasks.whenTaskAdded { - if ("package" in name) { + if ("package" in name || "assemble" in name) { dependsOn("copyAndroidNatives") } }