From 28f357733f1d658adcce00c14184b5ea6e1f44b8 Mon Sep 17 00:00:00 2001 From: Mauricio Narvaez Date: Wed, 29 May 2024 14:37:36 -0700 Subject: [PATCH] Ensure that Godot's version of libc++_shared.so is always selected in case dependencies have their own --- platform/android/java/app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index b83ef1471cf7..bde6a93c860b 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 {