Skip to content

Commit 1b561ef

Browse files
committed
Build libxml2, libcurl, and boringssl with support for Android 16kb page sizes
1 parent f2d15dd commit 1b561ef

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

swift-ci/sdks/android/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN apt-get -q update \
2424
golang \
2525
git \
2626
gnupg2 \
27-
libsqlite3-dev \
2827
libcurl4-openssl-dev \
2928
libedit-dev \
3029
libicu-dev \

swift-ci/sdks/android/scripts/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ for arch in $archs; do
283283
-DCMAKE_EXTRA_LINK_FLAGS="-rtlib=compiler-rt -unwindlib=libunwind -stdlib=libc++ -fuse-ld=lld -lc++ -lc++abi" \
284284
-DCMAKE_BUILD_TYPE=$build_type \
285285
-DCMAKE_INSTALL_PREFIX=$sdk_root/usr \
286+
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,max-page-size=16384" \
286287
-DLIBXML2_WITH_PYTHON=NO \
287288
-DLIBXML2_WITH_ICU=NO \
288289
-DLIBXML2_WITH_ICONV=NO \
@@ -311,6 +312,7 @@ for arch in $archs; do
311312
-DCMAKE_TOOLCHAIN_FILE=$ndk_home/build/cmake/android.toolchain.cmake \
312313
-DCMAKE_BUILD_TYPE=$build_type \
313314
-DCMAKE_INSTALL_PREFIX=$sdk_root/usr \
315+
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,max-page-size=16384" \
314316
-DBUILD_SHARED_LIBS=OFF \
315317
-DBUILD_STATIC_LIBS=ON \
316318
-DBUILD_TESTING=OFF
@@ -337,6 +339,7 @@ for arch in $archs; do
337339
-DCMAKE_TOOLCHAIN_FILE=$ndk_home/build/cmake/android.toolchain.cmake \
338340
-DCMAKE_BUILD_TYPE=$build_type \
339341
-DCMAKE_INSTALL_PREFIX=$sdk_root/usr \
342+
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,max-page-size=16384" \
340343
-DOPENSSL_ROOT_DIR=$sdk_root/usr \
341344
-DOPENSSL_INCLUDE_DIR=$sdk_root/usr/include \
342345
-DOPENSSL_SSL_LIBRARY=$sdk_root/usr/lib/libssl.a \

0 commit comments

Comments
 (0)