Skip to content

Commit 80db5bd

Browse files
committed
Merge pull request godotengine#92525 from m4gr3d/fix_libcpp_selection
Ensure that Godot's version of `libc++_shared.so` is always selected
2 parents 8ec272f + 28f3577 commit 80db5bd

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

platform/android/java/app/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ android {
124124
// - https://stackoverflow.com/a/44704840
125125
useLegacyPackaging shouldUseLegacyPackaging()
126126
}
127+
128+
// Always select Godot's version of libc++_shared.so in case deps have their own
129+
pickFirst 'lib/x86/libc++_shared.so'
130+
pickFirst 'lib/x86_64/libc++_shared.so'
131+
pickFirst 'lib/armeabi-v7a/libc++_shared.so'
132+
pickFirst 'lib/arm64-v8a/libc++_shared.so'
127133
}
128134

129135
signingConfigs {

0 commit comments

Comments
 (0)