From 4221153836f441788b538e82795727173985f6cd Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Mon, 17 Dec 2018 21:58:39 -0500
Subject: [PATCH] CI: Add Android universal builds

---
 .gitlab-ci.yml         |  8 ++++++++
 gitlab/ci_template.yml | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e79df2..dbdf73a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,6 +145,14 @@ build cerbero fedora x86_64 local:
     refs:
       - "master@gstreamer/gst-ci"
 
+build cerbero android universal local:
+  extends: '.cerbero android universal'
+  image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
+  when: 'manual'
+  except:
+    refs:
+      - "master@gstreamer/gst-ci"
+
 build cerbero cross win32 local:
   extends: '.cerbero cross win32'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 23ec2fd..6e97ef5 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -385,6 +385,34 @@ build cerbero fedora x86_64:
 
 
 #
+# Cerbero Android Universal build
+#
+cerbero deps android universal:
+  extends: '.cerbero deps'
+  variables:
+    CONFIG: "cross-android-universal.cbc"
+    ARCH: "android_universal"
+
+.cerbero android universal:
+  extends: '.cerbero'
+  variables:
+    CONFIG: "cross-android-universal.cbc"
+
+cerbero android universal:
+  extends: '.cerbero android universal'
+  dependencies:
+    - "cerbero deps android universal"
+  only:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
+build cerbero android universal:
+  extends: '.cerbero android universal'
+  except:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
+#
 # Cerbero Cross Windows builds
 #
 cerbero deps windows x86:
-- 
2.7.4