Alexandre Julliard : packaging: Use llvm-mingw to build the Android packages.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 650310376652caf1f5c6221dfac1e986cc28bfa8
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=650310376652caf1f5c6221dfac1e986cc28bfa8

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb 26 21:36:24 2021 +0100

packaging: Use llvm-mingw to build the Android packages.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 packaging/android/build-apks | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packaging/android/build-apks b/packaging/android/build-apks
index 3662a48..f28a994 100755
--- a/packaging/android/build-apks
+++ b/packaging/android/build-apks
@@ -32,6 +32,7 @@ silent=--silent
 makeflags="--no-print-directory $silent -j$(nproc)"
 
 android_ndk=android-ndk-r21d
+llvm_mingw=llvm-mingw-20201020-ucrt-ubuntu-18.04
 gradle=gradle-3.5.1
 png=libpng-1.6.37
 jpeg=jpeg-9d
@@ -80,6 +81,11 @@ config_gradle ()
     download $gradle https://services.gradle.org/distributions/$gradle-bin.zip
 }
 
+config_llvm_mingw ()
+{
+    download $llvm_mingw https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/$llvm_mingw.tar.xz
+}
+
 config_png ()
 {
     download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/download
@@ -278,8 +284,9 @@ test -z "$release" || rm -rf $basedir
 test -d $basedir || mkdir $basedir
 cd $basedir
 
-config_ndk
-config_gradle
+test -d $android_ndk || config_ndk
+test -d $gradle || config_gradle
+test -d $llvm_mingw || config_llvm_mingw
 
 test -d wine || git clone $winetree
 test -z "$release" || (cd wine && git checkout wine-$release)
@@ -301,8 +308,7 @@ do
     esac
 
     (cd $arch
-    config_toolchain
-    PATH=$default_path:$basedir/$gradle/bin:$basedir/$arch/toolchain/bin
+    PATH=$default_path:$basedir/$llvm_mingw/bin:$basedir/$gradle/bin:$basedir/$arch/toolchain/bin
     run_configure="./configure $silent --host=$host PKG_CONFIG=false"
     install_all)
 done