Merge pull request #113388 from m4gr3d/fix_android_build_regression

Fix Android build regression
This commit is contained in:
Rémi Verschelde 2025-12-01 11:50:24 +01:00
commit 7374a5e7c7
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 9 additions and 9 deletions

View file

@ -249,9 +249,9 @@ android {
sourceSets {
main.res.srcDirs += ['res']
debug.jniLibs.srcDirs += ['libs/debug', 'libs/debug/vulkan_validation_layers']
dev.jniLibs.srcDirs += ['libs/dev']
release.jniLibs.srcDirs += ['libs/release']
debug.jniLibs.srcDirs = ['libs/debug', 'libs/debug/vulkan_validation_layers']
dev.jniLibs.srcDirs = ['libs/dev']
release.jniLibs.srcDirs = ['libs/release']
}
applicationVariants.all { variant ->

View file

@ -77,14 +77,14 @@ android {
}
sourceSets {
debug.jniLibs.srcDirs += ['libs/debug']
dev.jniLibs.srcDirs += ['libs/dev']
release.jniLibs.srcDirs += ['libs/release']
debug.jniLibs.srcDirs = ['libs/debug']
dev.jniLibs.srcDirs = ['libs/dev']
release.jniLibs.srcDirs = ['libs/release']
// Editor jni library
editorRelease.jniLibs.srcDirs += ['libs/tools/release']
editorDebug.jniLibs.srcDirs += ['libs/tools/debug']
editorDev.jniLibs.srcDirs += ['libs/tools/dev']
editorRelease.jniLibs.srcDirs = ['libs/tools/release']
editorDebug.jniLibs.srcDirs = ['libs/tools/debug']
editorDev.jniLibs.srcDirs = ['libs/tools/dev']
}
libraryVariants.all { variant ->