From fb71ea1a75a980cad31d585d8917a3c3bcc3b5c5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 27 Nov 2018 22:39:25 +0000 Subject: [PATCH] Accept aapt without an extension depending on SDK setup --- util/buildscripts/scripts/compile_win32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/buildscripts/scripts/compile_win32.sh b/util/buildscripts/scripts/compile_win32.sh index 3588cfc46..51cf141f3 100755 --- a/util/buildscripts/scripts/compile_win32.sh +++ b/util/buildscripts/scripts/compile_win32.sh @@ -99,7 +99,7 @@ if uname -a | grep -iq msys; then GENERATOR="MSYS Makefiles" fi -AAPT=$(ls $ANDROID_SDK/build-tools/*/aapt.exe | tail -n 1) +AAPT=$(ls $ANDROID_SDK/build-tools/*/aapt{,.exe} | tail -n 1) # Check to see if we already have this built, and don't rebuild VERSION32=$($AAPT dump badging build-android-arm32/bin/*apk 2>/dev/null | grep -Eo "versionName='[0-9a-f]*'" | grep -Eo "'.*'" | tr -d "'")