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 {
|
||||
jniLibs {
|
||||
keepDebugSymbols += '**/libryujinx.so'
|
||||
useLegacyPackaging true
|
||||
}
|
||||
resources {
|
||||
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
||||
@ -100,4 +101,4 @@ dependencies {
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2'
|
||||
debugImplementation 'androidx.compose.ui:ui-tooling'
|
||||
debugImplementation 'androidx.compose.ui:ui-test-manifest'
|
||||
}
|
||||
}
|
||||
|
@ -23,7 +23,6 @@
|
||||
android:largeHeap="true"
|
||||
android:appCategory="game"
|
||||
android:theme="@style/Theme.RyujinxAndroid"
|
||||
android:extractNativeLibs="true"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
|
@ -1,6 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id 'com.android.application' version '8.0.2' apply false
|
||||
id 'com.android.library' version '8.0.2' apply false
|
||||
id 'com.android.application' version '8.1.0' apply false
|
||||
id 'com.android.library' version '8.1.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
|
||||
}
|
||||
}
|
||||
|
@ -32,4 +32,4 @@ org.ryujinx.config=debug
|
||||
# Default: auto
|
||||
org.ryujinx.symbols.strip=auto
|
||||
# Output path of libryujinx.so
|
||||
org.ryujinx.publish.path=app/src/main/jniLibs/arm64-v8a
|
||||
org.ryujinx.publish.path=app/src/main/jniLibs/arm64-v8a
|
||||
|
@ -50,7 +50,7 @@ else {
|
||||
// Trees
|
||||
|
||||
ext.outputTree = fileTree("${buildDir}/publish") {
|
||||
include '**/*'
|
||||
include "*/${configuration.toLowerCase()}_*/*"
|
||||
builtBy 'compileLibRyujinx'
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user