[poppler] .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 9e302b6bf42c5d8b48bc5b6c04621e52d52da3f2
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 19 22:51:21 2020 +0000

    CI: android: adaptations to port to new version of the sdk

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13cdbe05..c5d49d7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,26 +81,24 @@ build_clazy:
 
 build_android:
   stage: build
-  image: kdeorg/android-aarch64-sdk
+  image: kdeorg/android-sdk
   before_script:
     - wget https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz
     - tar xvfh freetype-2.10.1.tar.xz
     - pushd freetype-2.10.1
-    - 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"
+    - CFLAGS=-std=gnu99 STANDALONE_EXTRA="--arch arm64" /opt/helpers/build-standalone "./autogen.sh && ./configure --enable-shared=no --prefix=/opt/popplerandroid-deps --host=aarch64-linux-android && 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_ARCH_ABI=arm64-v8a
+    - 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja ..
                          -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_LIBOPENJPEG=unmaintained
+                         -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
     - ninja && ninja install
 
 qt5_docs: