Skip to content

Commit 7374a5e

Browse files
committed
Merge pull request #113388 from m4gr3d/fix_android_build_regression
Fix Android build regression
2 parents 84abf39 + 0f160c7 commit 7374a5e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

platform/android/java/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ android {
249249

250250
sourceSets {
251251
main.res.srcDirs += ['res']
252-
debug.jniLibs.srcDirs += ['libs/debug', 'libs/debug/vulkan_validation_layers']
253-
dev.jniLibs.srcDirs += ['libs/dev']
254-
release.jniLibs.srcDirs += ['libs/release']
252+
debug.jniLibs.srcDirs = ['libs/debug', 'libs/debug/vulkan_validation_layers']
253+
dev.jniLibs.srcDirs = ['libs/dev']
254+
release.jniLibs.srcDirs = ['libs/release']
255255
}
256256

257257
applicationVariants.all { variant ->

platform/android/java/lib/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ android {
7777
}
7878

7979
sourceSets {
80-
debug.jniLibs.srcDirs += ['libs/debug']
81-
dev.jniLibs.srcDirs += ['libs/dev']
82-
release.jniLibs.srcDirs += ['libs/release']
80+
debug.jniLibs.srcDirs = ['libs/debug']
81+
dev.jniLibs.srcDirs = ['libs/dev']
82+
release.jniLibs.srcDirs = ['libs/release']
8383

8484
// Editor jni library
85-
editorRelease.jniLibs.srcDirs += ['libs/tools/release']
86-
editorDebug.jniLibs.srcDirs += ['libs/tools/debug']
87-
editorDev.jniLibs.srcDirs += ['libs/tools/dev']
85+
editorRelease.jniLibs.srcDirs = ['libs/tools/release']
86+
editorDebug.jniLibs.srcDirs = ['libs/tools/debug']
87+
editorDev.jniLibs.srcDirs = ['libs/tools/dev']
8888
}
8989

9090
libraryVariants.all { variant ->

0 commit comments

Comments
 (0)