mirror of
https://github.com/godotengine/godot.git
synced 2026-01-03 18:11:19 +03:00
Merge pull request #113388 from m4gr3d/fix_android_build_regression
Fix Android build regression
This commit is contained in:
@@ -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 ->
|
||||
|
||||
@@ -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 ->
|
||||
|
||||
Reference in New Issue
Block a user