.gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit c6dbde146a47e2c899b57923b370470eddeb90f7 Author: Albert Astals Cid <[email protected]> Date: Wed Aug 21 13:00:17 2019 +0200 CI: Android move to the newer kdeorg sdk image diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b9fd4cb..e7804304 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,25 +81,25 @@ build_clazy: build_android: stage: build - image: kdeorg/android-sdk + image: kdeorg/android-aarch64-sdk before_script: - git clone https://git.savannah.gnu.org/git/freetype/freetype2.git --single-branch -b VER-2-8-1 - pushd freetype2 - - ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi CFLAGS=-std=gnu99 /opt/helpers/build-standalone "./autogen.sh && ./configure --prefix=/opt/popplerandroid-deps --host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install" + - CFLAGS=-std=gnu99 /opt/helpers/build-standalone "./autogen.sh && ./configure --enable-shared=no --prefix=/opt/popplerandroid-deps --host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install" - popd script: - mkdir -p build && cd build - 'cmake -G Ninja .. -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_STL_TYPE=c++_shared - -DCMAKE_ANDROID_API=24 + -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a + -DCMAKE_ANDROID_API=28 -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_INSTALL_PREFIX="/opt/popplerandroid-deps" -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/popplerandroid-deps" -DCMAKE_BUILD_TYPE=debug -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DENABLE_DCTDECODER=unmaintained - -DENABLE_LIBOPENJPEG=unmaintained - -DENABLE_CPP=OFF' + -DENABLE_LIBOPENJPEG=unmaintained' - ninja && ninja install qt5_docs: _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
