Alexandre Julliard : packaging: Update Android build script for latest Wine.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Sep 12 10:54:15 2020 +0200

packaging: Update Android build script for latest Wine.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 packaging/android/build-apks | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packaging/android/build-apks b/packaging/android/build-apks
index 314bc69..68fea8e 100755
--- a/packaging/android/build-apks
+++ b/packaging/android/build-apks
@@ -249,7 +249,8 @@ install_all ()
     test -d wine || config_wine
     cd wine
     destdir=$(pwd)/dlls/wineandroid.drv
-    install=../../wine/tools/install-sh
+    srcdir=../../wine
+    install=$srcdir/tools/install-sh
     rm -rf $destdir/assets assets-tmp $destdir/lib
     make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp
 
@@ -274,7 +275,7 @@ install_all ()
     $install -m 644 $sourcedir/LICENSE.txt assets-tmp/LICENSE.txt
     mv assets-tmp $destdir/assets
 
-    (cd $destdir && make build.gradle && gradle -q -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug)
+    (cd $destdir && gradle -q -Psrcdir=../../$srcdir/dlls/wineandroid.drv -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug)
     mv $destdir/build/outputs/apk/wine-debug.apk ../../wine-${release:-debug}-$arch.apk
 }