diff --git a/.gitlab-ci/container/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh index d815a7e1cf5..ab2cfc51455 100644 --- a/.gitlab-ci/container/create-android-cross-file.sh +++ b/.gitlab-ci/container/create-android-cross-file.sh @@ -22,6 +22,7 @@ cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_v c_ld = 'lld' cpp_ld = 'lld' strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip' +rust = ['rustc', '--target', '${arch2}'] pkg-config = ['/usr/bin/pkgconf'] [host_machine] @@ -32,6 +33,7 @@ endian = 'little' [properties] needs_exe_wrapper = true +bindgen_clang_arguments = ['-target', '${arch2}', '--sysroot', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot'] pkg_config_libdir = '/usr/local/lib/${arch2}/pkgconfig/:/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${arch2}/pkgconfig/' EOF diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 2c3da1b8642..5b0bad0a82a 100755 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -35,6 +35,13 @@ find /${ndk}/ -type f \( -iname '*clang-check*' -o -iname '*clang-tidy*' -o -ina sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" $ANDROID_SDK_VERSION +# Install android Rust targets +rustup target add \ + x86_64-linux-android \ + i686-linux-android \ + aarch64-linux-android \ + armv7-linux-androideabi + sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64 $ANDROID_SDK_VERSION sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86 $ANDROID_SDK_VERSION sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION @@ -113,6 +120,8 @@ rm -rf $LIBELF_VERSION # to avoid rebuilding it in a future run if the version does not change. bash .gitlab-ci/container/build-android-x86_64-llvm.sh +. .gitlab-ci/container/build-bindgen.sh + apt-get purge -y "${EPHEMERAL[@]}" . .gitlab-ci/container/container_post_build.sh