Use shared C++ stl

opendocument-app · Aug 8, 2024 · e0fe8fb · e0fe8fb
1 parent a1d2d2c
commit e0fe8fb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",
                 )
             }