From ab57df26225ef99f91e179dc53ebeabfaaaf92fa Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 24 Sep 2020 16:44:50 -0700
Subject: [PATCH] ci/android: Switch build to using platform SDK version 26.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In SDK 25 (Android 7, 2016), the kernel only went up to around 4.4, so
the upstreamed sync API didn't exist, and libsync didn't expose
sync_merge().

In SDK 26 (Android 8, 2017), the kernel is sometimes bumped to 4.9 or
4.14, but libsync has a sync_merge() that operates on either the
downstream or the upstream API.

Since our android-targeting drivers in general use sync objects (requiring
a kernel newer than 7 got) and sync_merge() (suggesting interaction with
external fencing that started in Android 8), make CI build against an SDK
version with the sync API.  I think really doing SDK 25 right at this
point would involve backporting mesa with some #ifdefs to not expose sync
APIs that wouldn't work.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6821>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d123d0e6a8b..378c3a2bace 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -689,6 +689,7 @@ meson-android:
     EXTRA_OPTION: >
       -D android-stub=true
       -D llvm=disabled
+      -D platform-sdk-version=26
     GALLIUM_ST: >
       -D dri3=disabled
       -D gallium-vdpau=disabled