forked from MeloNX/MeloNX
Update Android gradle plugins
Fix gradle build issues when multiple configurations are present
This commit is contained in:
parent
b28f9a6331
commit
8ac307166a
@ -55,6 +55,7 @@ android {
|
|||||||
packagingOptions {
|
packagingOptions {
|
||||||
jniLibs {
|
jniLibs {
|
||||||
keepDebugSymbols += '**/libryujinx.so'
|
keepDebugSymbols += '**/libryujinx.so'
|
||||||
|
useLegacyPackaging true
|
||||||
}
|
}
|
||||||
resources {
|
resources {
|
||||||
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
android:appCategory="game"
|
android:appCategory="game"
|
||||||
android:theme="@style/Theme.RyujinxAndroid"
|
android:theme="@style/Theme.RyujinxAndroid"
|
||||||
android:extractNativeLibs="true"
|
|
||||||
tools:targetApi="31">
|
tools:targetApi="31">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.0.2' apply false
|
id 'com.android.application' version '8.1.0' apply false
|
||||||
id 'com.android.library' version '8.0.2' apply false
|
id 'com.android.library' version '8.1.0' apply false
|
||||||
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
|
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
|
||||||
}
|
}
|
@ -50,7 +50,7 @@ else {
|
|||||||
// Trees
|
// Trees
|
||||||
|
|
||||||
ext.outputTree = fileTree("${buildDir}/publish") {
|
ext.outputTree = fileTree("${buildDir}/publish") {
|
||||||
include '**/*'
|
include "*/${configuration.toLowerCase()}_*/*"
|
||||||
builtBy 'compileLibRyujinx'
|
builtBy 'compileLibRyujinx'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user