diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-30 11:48:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-30 11:48:15 +0200 |
| commit | 80db5bd28eb236a3afb1d6e4adf13109b8711a97 (patch) | |
| tree | e665ebe6adf41ad8522233527a6136c18a55760f | |
| parent | 8ec272f288fbc679f39050ffe569d85c9296f675 (diff) | |
| parent | 28f357733f1d658adcce00c14184b5ea6e1f44b8 (diff) | |
| download | redot-engine-80db5bd28eb236a3afb1d6e4adf13109b8711a97.tar.gz | |
Merge pull request #92525 from m4gr3d/fix_libcpp_selection
Ensure that Godot's version of `libc++_shared.so` is always selected
| -rw-r--r-- | platform/android/java/app/build.gradle | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index b83ef1471c..bde6a93c86 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -124,6 +124,12 @@ android { // - https://stackoverflow.com/a/44704840 useLegacyPackaging shouldUseLegacyPackaging() } + + // Always select Godot's version of libc++_shared.so in case deps have their own + pickFirst 'lib/x86/libc++_shared.so' + pickFirst 'lib/x86_64/libc++_shared.so' + pickFirst 'lib/armeabi-v7a/libc++_shared.so' + pickFirst 'lib/arm64-v8a/libc++_shared.so' } signingConfigs { |