diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 index c50713fc88d3..6a9884297fa0 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 @@ -19,7 +19,7 @@ build_type=RelWithDebInfo compiler=clang compiler.version=17 compiler.cppstd=20 -compiler.libcxx=c++_static +compiler.libcxx=c++_shared [conf] tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 index 9b177f19a1a1..1a3efbd7ed0d 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 @@ -19,7 +19,7 @@ build_type=RelWithDebInfo compiler=clang compiler.version=17 compiler.cppstd=20 -compiler.libcxx=c++_static +compiler.libcxx=c++_shared [conf] tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 index 4eb02bd985f4..0c411a794720 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 @@ -19,7 +19,7 @@ build_type=RelWithDebInfo compiler=clang compiler.version=17 compiler.cppstd=20 -compiler.libcxx=c++_static +compiler.libcxx=c++_shared [conf] tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 index acca82e01e83..59e38e4f820b 100644 --- a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 +++ b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 @@ -19,7 +19,7 @@ build_type=RelWithDebInfo compiler=clang compiler.version=17 compiler.cppstd=20 -compiler.libcxx=c++_static +compiler.libcxx=c++_shared [conf] tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}} diff --git a/app/build.gradle b/app/build.gradle index ee3b524ca389..77c0922ff3a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,8 @@ android { targets "odr-core", "envvar", "pdf2htmlEX-android" arguments( "-DCMAKE_TOOLCHAIN_FILE=conan_android_toolchain.cmake", + // We can migrate to static STL once all C++ deps are in conan and linked as one .so library + "-DANDROID_STL=c++_shared", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", ) }