From ce99b41bb2b8467541491f705b593eefd60e1457 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Thu, 7 Apr 2022 10:51:00 +0200
Subject: [PATCH] Add Android API 24 armeabi jobs for shared runners

---
 .gitlab-ci.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 385f12d65..8fcf2670d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,3 +154,71 @@ android-minapi21_armeabi-v7a_bundleReleaseAar:
   artifacts:
     paths:
       - outputs-aar/
+
+android-minapi24_arm64-v8a_bundleDebugAar:
+  rules:
+    - if: $PROJECT_HAVE_STORAGE50_RUNNERS != "true"
+  image: registry.gitlab.com/retroshare/retroshare:android_aar_base_24_arm64-v8a_bundleDebugAar
+  script:
+    - rm -rf /libretroshare-aar/
+    - > 
+      ./gradlew bundleDebugAar
+      -Dorg.gradle.project.buildDir=/libretroshare-build/
+      -PANDROID_MIN_API_LEVEL=24
+      -PLIBRETROSHARE_SOURCE_VERSION="$CI_COMMIT_SHORT_SHA"
+      -PNATIVE_TOOLCHAINS_DIR="/libretroshare-native-toolchains/"
+    - mv /libretroshare-build/outputs/aar/ $CI_PROJECT_DIR/outputs-aar/
+  artifacts:
+    paths:
+      - outputs-aar/
+
+android-minapi24_arm64-v8a_bundleReleaseAar:
+  rules:
+    - if: $PROJECT_HAVE_STORAGE50_RUNNERS != "true"
+  image: registry.gitlab.com/retroshare/retroshare:android_aar_base_24_arm64-v8a_bundleReleaseAar
+  script:
+    - rm -rf /libretroshare-aar/
+    - > 
+      ./gradlew bundleReleaseAar
+      -Dorg.gradle.project.buildDir=/libretroshare-build/
+      -PANDROID_MIN_API_LEVEL=24
+      -PLIBRETROSHARE_SOURCE_VERSION="$CI_COMMIT_SHORT_SHA"
+      -PNATIVE_TOOLCHAINS_DIR="/libretroshare-native-toolchains/"
+    - mv /libretroshare-build/outputs/aar/ $CI_PROJECT_DIR/outputs-aar/
+  artifacts:
+    paths:
+      - outputs-aar/
+
+android-minapi24_armeabi-v7a_bundleDebugAar:
+  rules:
+    - if: $PROJECT_HAVE_STORAGE50_RUNNERS != "true"
+  image: registry.gitlab.com/retroshare/retroshare:android_aar_base_24_armeabi-v7a_bundleDebugAar
+  script:
+    - rm -rf /libretroshare-aar/
+    - > 
+      ./gradlew bundleDebugAar
+      -Dorg.gradle.project.buildDir=/libretroshare-build/
+      -PANDROID_MIN_API_LEVEL=24
+      -PLIBRETROSHARE_SOURCE_VERSION="$CI_COMMIT_SHORT_SHA"
+      -PNATIVE_TOOLCHAINS_DIR="/libretroshare-native-toolchains/"
+    - mv /libretroshare-build/outputs/aar/ $CI_PROJECT_DIR/outputs-aar/
+  artifacts:
+    paths:
+      - outputs-aar/
+
+android-minapi24_armeabi-v7a_bundleReleaseAar:
+  rules:
+    - if: $PROJECT_HAVE_STORAGE50_RUNNERS != "true"
+  image: registry.gitlab.com/retroshare/retroshare:android_aar_base_24_armeabi-v7a_bundleReleaseAar
+  script:
+    - rm -rf /libretroshare-aar/
+    - > 
+      ./gradlew bundleReleaseAar
+      -Dorg.gradle.project.buildDir=/libretroshare-build/
+      -PANDROID_MIN_API_LEVEL=24
+      -PLIBRETROSHARE_SOURCE_VERSION="$CI_COMMIT_SHORT_SHA"
+      -PNATIVE_TOOLCHAINS_DIR="/libretroshare-native-toolchains/"
+    - mv /libretroshare-build/outputs/aar/ $CI_PROJECT_DIR/outputs-aar/
+  artifacts:
+    paths:
+      - outputs-aar/