From c408080c2712a08108368b8e981c81d006ab4fab Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 21 Nov 2012 15:56:14 +0300
Subject: [android][win] Android apk can be built with ant from GitBash console

---
 tools/android/aapt.exe        | Bin 0 -> 128512 bytes
 tools/autobuild/build.sh      |   5 ++++-
 tools/autobuild/ndk_helper.sh |   6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 tools/android/aapt.exe

(limited to 'tools')

diff --git a/tools/android/aapt.exe b/tools/android/aapt.exe
new file mode 100644
index 0000000000..21e94a99dd
Binary files /dev/null and b/tools/android/aapt.exe differ
diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh
index e7004fd8a4..570b6bb72d 100644
--- a/tools/autobuild/build.sh
+++ b/tools/autobuild/build.sh
@@ -9,9 +9,12 @@ source "$LOCAL_DIRNAME/detect_qmake.sh"
 # Prints number of cores to stdout
 GetCPUCores() {
   case "$OSTYPE" in
+    # it's GitBash under Windows
+    msys)      echo $NUMBER_OF_PROCESSORS
+               ;;
     linux-gnu) grep -c ^processor /proc/cpuinfo 2>/dev/null
                ;;
-    darwin*) sysctl -n hw.ncpu
+    darwin*)   sysctl -n hw.ncpu
                ;;
     *)         echo "Unsupported platform in $0"
                exit 1
diff --git a/tools/autobuild/ndk_helper.sh b/tools/autobuild/ndk_helper.sh
index 6e52f2e8b3..ff15078856 100644
--- a/tools/autobuild/ndk_helper.sh
+++ b/tools/autobuild/ndk_helper.sh
@@ -27,6 +27,10 @@ GetNdkHost()
     echo "darwin-x86"
     return 0
   fi
-  # TODO add Windows
+  if [[ "$OSTYPE" == "msys" ]]; then
+    echo windows
+    return 0
+  fi
+  echo "ERROR: Can't detect your host OS"
   return 1
 }
-- 
cgit v1.2.3