diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/build.gradle | 67 | ||||
| -rw-r--r-- | android/project.properties | 2 |
3 files changed, 48 insertions, 23 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 4f5cbd9..ae7aeca 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -11,6 +11,8 @@ <application android:allowBackup="true" android:icon="@drawable/ic_launcher" + android:isGame="true" + android:appCategory="game" android:label="@string/app_name" android:theme="@style/GdxTheme" > <activity diff --git a/android/build.gradle b/android/build.gradle index 146a880..93ce823 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ android { - buildToolsVersion "27.0.3" - compileSdkVersion 27 + buildToolsVersion "29.0.2" + compileSdkVersion 29 sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -9,41 +9,64 @@ android { renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] } - instrumentTest.setRoot('tests') + } + packagingOptions { + exclude 'META-INF/robovm/ios/robovm.xml' + } + defaultConfig { + applicationId "ch.asynk.rustanddust.android" + minSdkVersion 14 + targetSdkVersion 29 + versionCode 1 + versionName "1.0.1" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } } -// needed to add JNI shared libraries to APK when compiling on CLI -tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask -> - pkgTask.jniFolders = new HashSet<File>() - pkgTask.jniFolders.add(new File(projectDir, 'libs')) -} // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. -task copyAndroidNatives() { - file("libs/armeabi/").mkdirs(); - file("libs/armeabi-v7a/").mkdirs(); - file("libs/x86/").mkdirs(); +task copyAndroidNatives { + doFirst { + file("libs/armeabi/").mkdirs() + 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-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") - if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") - if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") - if(outputDir != null) { - copy { - from zipTree(jar) - into outputDir - include "*.so" + 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-armeabi.jar")) outputDir = file("libs/armeabi") + 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" + } } } } } +tasks.whenTaskAdded { packageTask -> + if (packageTask.name.contains("package")) { + packageTask.dependsOn 'copyAndroidNatives' + } +} + task run(type: Exec) { def path def localProperties = project.file("../local.properties") diff --git a/android/project.properties b/android/project.properties index 4ab1256..4c31406 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-19 +target=android-27 |