From c6d72e109f0fadf02c87b564a4290f41dd116bb8 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 9 Dec 2019 11:59:14 +0200 Subject: [PATCH] Switching to build machine's ninja binary --- scripts/export-host-variables.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/export-host-variables.sh b/scripts/export-host-variables.sh index c9b4257..0efb927 100755 --- a/scripts/export-host-variables.sh +++ b/scripts/export-host-variables.sh @@ -25,10 +25,10 @@ export HOST_NPROC=$HOST_NPROC # Using CMake from the Android SDK export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake -# Using Ninja from the Android SDK -export NINJA_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/ninja -# Using host Make, because Android NDK's Make (before r21) doesn't work properly in MSYS2 on Windows +# Using Build machine's Make, because Android NDK's Make (before r21) doesn't work properly in MSYS2 on Windows export MAKE_EXECUTABLE=$(which make) +# Using Build machine's Ninja. It is used for libdav1d building. Needs to be installed +export NINJA_EXECUTABLE=$(which ninja) # Meson is used for libdav1d building. Needs to be installed export MESON_EXECUTABLE=$(which meson) # Nasm is used for libdav1d building. Needs to be installed