mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 01:32:42 +00:00
android: Use cross file shipped by gst-build
We want to test that cross files shipped by gst-build are working, instead of a generating our own.
This commit is contained in:
parent
791757de6c
commit
aa13631e38
3 changed files with 4 additions and 26 deletions
|
@ -131,8 +131,8 @@ build android 28 local:
|
||||||
MESON_ARGS: >
|
MESON_ARGS: >
|
||||||
-Dbad=enabled
|
-Dbad=enabled
|
||||||
-Dbad:androidmedia=enabled
|
-Dbad:androidmedia=enabled
|
||||||
--cross-file /opt/android_arm64_28.txt
|
--cross-file cross-files/android_arm64_api28.txt
|
||||||
image: "${CI_REGISTRY_IMAGE}/amd64/android_28:latest"
|
image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu:latest"
|
||||||
except:
|
except:
|
||||||
refs:
|
refs:
|
||||||
- "master@gstreamer/gst-ci"
|
- "master@gstreamer/gst-ci"
|
||||||
|
|
|
@ -23,27 +23,5 @@ set -eu
|
||||||
|
|
||||||
arch=$1
|
arch=$1
|
||||||
api=$2
|
api=$2
|
||||||
toolchain_path=/opt/android-toolchain-$arch-$api
|
toolchain_path=/opt/android-$arch-api$api
|
||||||
|
|
||||||
# Create standalone toolchains
|
|
||||||
/opt/android-ndk/build/tools/make_standalone_toolchain.py --arch $arch --api $api --install-dir $toolchain_path
|
/opt/android-ndk/build/tools/make_standalone_toolchain.py --arch $arch --api $api --install-dir $toolchain_path
|
||||||
|
|
||||||
# Create a cross file that can be passed to meson
|
|
||||||
cat > /opt/android_${arch}_${api}.txt <<- EOM
|
|
||||||
[host_machine]
|
|
||||||
system = 'android'
|
|
||||||
cpu_family = 'aarch64'
|
|
||||||
cpu = '${arch}'
|
|
||||||
endian = 'little'
|
|
||||||
|
|
||||||
[properties]
|
|
||||||
c_args = ['--sysroot', '${toolchain_path}/sysroot']
|
|
||||||
cpp_args = ['--sysroot', '${toolchain_path}/sysroot']
|
|
||||||
|
|
||||||
[binaries]
|
|
||||||
c = '${toolchain_path}/bin/aarch64-linux-android-clang'
|
|
||||||
cpp = '${toolchain_path}/bin/aarch64-linux-android-clang++'
|
|
||||||
ar = '${toolchain_path}/bin/aarch64-linux-android-ar'
|
|
||||||
strip = '${toolchain_path}/bin/aarch64-linux-android-strip'
|
|
||||||
pkgconfig = 'false'
|
|
||||||
EOM
|
|
||||||
|
|
|
@ -39,4 +39,4 @@ rm -rf /opt/android-ndk
|
||||||
|
|
||||||
# get gst-build and make all subprojects available
|
# get gst-build and make all subprojects available
|
||||||
git clone git://anongit.freedesktop.org/gstreamer/gst-build '/gst-build/'
|
git clone git://anongit.freedesktop.org/gstreamer/gst-build '/gst-build/'
|
||||||
cd '/gst-build/' && meson build/ && rm -rf build/
|
meson subprojects download --sourcedir /gst-build
|
||||||
|
|
Loading…
Reference in a new issue