Partial revert of 9ed6305e

For post-merge of android ndk-21 as part of:
!266
cerbero!463
45 jobs for master in 20 minutes and 22 seconds (queued for 9 seconds)
Status Job ID Name Coverage
  Build Docker
manual #2192375
allowed to fail manual
alpine amd64 manifest builder docker
passed #2193279
manual
android docker

00:16:43

passed #2193307
manual
cerbero fedora amd64 docker

00:19:11

manual #2192378
allowed to fail manual
fedora amd64 docker
manual #2192377
allowed to fail manual
gst-indent amd64 docker
manual #2192376
allowed to fail manual
test manifest amd64 docker
failed #2192380
allowed to fail manual
android docker

00:01:33

canceled #2192379
allowed to fail manual
cerbero fedora amd64 docker

00:02:19

canceled #2193304
allowed to fail manual
cerbero fedora amd64 docker

00:00:02

canceled #2193305
allowed to fail manual
cerbero fedora amd64 docker

00:00:04

canceled #2193306
allowed to fail manual
cerbero fedora amd64 docker

00:00:10

 
  Preparation
passed #2192382
gst indent

00:00:27

manual #2192381
manual
manifest
passed #2192383
test manifest

00:00:22

 
  Build
created #2192393
gstreamer
build cerbero cross-android universal
created #2192397
gst-ios-13.2
build cerbero cross-ios universal
created #2192394
gstreamer
build cerbero cross win32
created #2192395
gstreamer
build cerbero cross win64
created #2192392
gstreamer
build cerbero fedora x86_64
created #2192396
gst-macos-10.15
build cerbero macos x86_64
created #2192388
build clang fedora x86_64
created #2192384
build fedora x86_64
created #2192399
build gst-omx tizonia fedora x86_64
created #2192398
build gst-omx zynq fedora x86_64
created #2192391
docker windows 1809 gstreamer-windows allowed to fail manual
build msys2
created #2192385
build nodebug fedora x86_64
created #2192386
build static fedora x86_64
created #2192387
build static nodebug fedora x86_64
created #2192389
docker windows 1809 gstreamer-windows
build vs2017 amd64
created #2192390
docker windows 1809 gstreamer-windows allowed to fail manual
build vs2017 x86
 
  Test
created #2192400
gstreamer
check fedora
created #2192401
gstreamer
integration testsuites fedora 1/4
created #2192402
gstreamer
integration testsuites fedora 2/4
created #2192403
gstreamer
integration testsuites fedora 3/4
created #2192404
gstreamer
integration testsuites fedora 4/4
created #2192409
gstreamer
valgrind bad
created #2192406
gstreamer
valgrind base
created #2192405
gstreamer
valgrind core
created #2192410
gstreamer
valgrind ges
created #2192407
gstreamer
valgrind good
created #2192408
gstreamer
valgrind ugly
 
  Integrate
created #2192412
cross-android universal examples
created #2192414
gst-ios-13.2
cross-ios universal examples
created #2192413
documentation
created #2192411
gstreamer-full