diff --git a/android/build.gradle b/android/build.gradle index 2f33476a77..88c131dda6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,11 +30,6 @@ dependencies{ natives "com.github.Anuken.Arc:natives-android:${getArcHash()}" natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}" - - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" - natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" } task deploy(type: Copy){ @@ -115,30 +110,11 @@ android{ // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. task copyAndroidNatives(){ - file("libs/armeabi-v7a/").mkdirs() - file("libs/arm64-v8a/").mkdirs() - file("libs/x86_64/").mkdirs() - file("libs/x86/").mkdirs() - configurations.natives.files.each{ jar -> - def outputDir = null - if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") - if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") - if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") - if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") - if(outputDir != null){ - copy{ - from zipTree(jar) - into outputDir - include "*.so" - } - }else{ - println("copying $jar") - copy{ - from zipTree(jar) - into file("libs/") - include "**" - } + copy{ + from zipTree(jar) + into file("libs/") + include "**" } } } diff --git a/gradle.properties b/gradle.properties index 371476a071..99656d7edf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=decebd51f1851add205e96a03d1e628bf7efcbc7 +archash=f8891ab73ee41db01efe354e96d6c5e91eb01358