From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 9 Jun 2021 10:55:28 +0000 (+0100)
Subject: Add Android CI builds
X-Git-Tag: v8.20~158
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b19e2880daac3153b0717c9c9b530147a2c86cb0;p=users%2Fdwmw2%2Fopenconnect.git

Add Android CI builds

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b73ad0f..6536d838 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ variables:
   MINGW32_BUILD: openconnect-cli-mingw32
   MINGW64_BUILD: openconnect-cli-mingw64
   UBUNTU_BUILD: openconnect-cli-ubuntu
+  ANDROID_BUILD: openconnect-cli-android
+  ANDROID_TOOLCHAINDIR: /opt/android-sdk-linux_x86/toolchains
 
 image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
 
@@ -524,6 +526,54 @@ MinGW64/OpenSSL:
       - tests/*.log
       - openconnect-installer.exe
 
+Android/x86_64:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$ANDROID_BUILD
+  script:
+  tags:
+  - shared
+  script:
+  - make -C android ARCH=x86_64 TOOLCHAIN=$ANDROID_TOOLCHAINDIR/'$(TRIPLET)-$(API_LEVEL)'
+  artifacts:
+    when: always
+    paths:
+      - android/*-linux-android*/out/*
+
+Android/x86:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$ANDROID_BUILD
+  script:
+  tags:
+  - shared
+  script:
+  - make -C android ARCH=x86 TOOLCHAIN=$ANDROID_TOOLCHAINDIR/'$(TRIPLET)-$(API_LEVEL)'
+  artifacts:
+    when: always
+    paths:
+      - android/*-linux-android*/out/*
+
+Android/arm:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$ANDROID_BUILD
+  script:
+  tags:
+  - shared
+  script:
+  - make -C android ARCH=arm TOOLCHAIN=$ANDROID_TOOLCHAINDIR/'$(TRIPLET)-$(API_LEVEL)'
+  artifacts:
+    when: always
+    paths:
+      - android/*-linux-android*/out/*
+
+Android/arm64:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$ANDROID_BUILD
+  script:
+  tags:
+  - shared
+  script:
+  - make -C android ARCH=arm64 TOOLCHAIN=$ANDROID_TOOLCHAINDIR/'$(TRIPLET)-$(API_LEVEL)'
+  artifacts:
+    when: always
+    paths:
+      - android/*-linux-android*/out/*
+
 static-analyzer/GnuTLS/Fedora:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:buildenv-fedora
   script: