From 4b659ae187ed94de91d7fdb0aaed6a8388142bc4 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Sat, 18 Jun 2022 13:01:21 -0700
Subject: [PATCH] Fix "client_android_build" build target

---
 build.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 250f120b12..90ee146eb1 100644
--- a/build.xml
+++ b/build.xml
@@ -1154,17 +1154,24 @@
   <!-- START: android webview client -->
 
   <target name="client_android_build" description="Builds WebView client for Android devices">
+    <condition property="gradlew.exec" value="cmd">
+      <os family="windows"/>
+    </condition>
+    <condition property="gradlew.script" value="/c &quot;${user.dir}/android/gradlew.bat&quot;">
+      <os family="windows"/>
+    </condition>
+    <property name="gradlew.exec" value="sh"/>
+    <property name="gradlew.script" value="&quot;${user.dir}/android/gradlew&quot;"/>
+
     <echo
       if:set="exclude.webview"
       message="ANDROID_SDK_ROOT environment variable not set. Skipping Android WebView client build."/>
     <echo
       unless:set="exclude.webview"
       message="Building Android WebView client."/>
-
-    <condition property="gradlew" value="${user.dir}/android/gradlew.bat">
-      <os family="windows"/>
-    </condition>
-    <property name="gradlew" value="${user.dir}/android/gradlew"/>
+    <echo
+      unless:set="exclude.webview"
+      message="Gradle command: ${gradlew.exec} ${gradlew.script}"/>
 
     <property name="android.build" value="assembleDebug"/>
 
@@ -1188,7 +1195,8 @@
     </condition>
 
     <exec unless:set="exclude.webview" failonerror="true"
-        executable="${gradlew}" dir="android/">
+        executable="${gradlew.exec}" dir="android/">
+      <arg line="${gradlew.script}"/>
       <arg if:set="gradle.params" line="${gradle.params}"/>
       <arg if:set="android.build_wout_rev" value="${android.build}"/>
       <arg if:set="android.build_w_rev" line="-Pandroid.rev=${android.rev} ${android.build}"/>