From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 13 Dec 2018 18:37:38 +0000 (-0500)
Subject: android: Use the new docker image
X-Git-Tag: 1.19.3~497^2~448
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6542818ffb8018b8719ecc1b16aee225576742e6;p=platform%2Fupstream%2Fgstreamer.git

android: Use the new docker image
---

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 41e951b..333e4ff 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -108,14 +108,12 @@ build fedora x86_64:
 
 build android arm64 api28:
   extends: '.build'
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android_28:f085d34a32cb8cac95cbd420344efeaa647d08d5'
+  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/ubuntu:aa13631e38cb4e1e4ee1c869aa523952dcd8cca7'
   variables:
     MESON_ARGS: >
       -Dbad=enabled
       -Dbad:androidmedia=enabled
-      --cross-file /android_arm64_28.txt
-  before_script:
-    - cat /android_arm64_28.txt
+      --cross-file cross-files/android_arm64_api28.txt
 
 .test:
   stage: 'test'