Merge pull request kivy#11 from hansent/master

tito · tito · commit 6ffe47e65be9 · 2012-02-11T02:29:48.000-08:00
use ANDROIDSDK path in build.py
diff --git a/src/build.py b/src/build.py
@@ -22,6 +22,11 @@
     ANDROID = 'android'
     ANT = 'ant'
 
+#if ANDROIDSDK is on path, use android from this path
+ANDROIDSDK = os.environ.get('ANDROIDSDK')
+if ANDROIDSDK:
+    ANDROID = os.path.join(ANDROIDSDK, 'tools', ANDROID)
+
 curdir = dirname(__file__)
 
 # Try to find a host version of Python that matches our ARM version.
@@ -240,7 +245,7 @@ def make_package(args):
     # Update the project to a recent version.
     try:
         subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', 'android-8'])
-    except IOError:
+    except (OSError, IOError):
         print 'An error occured while calling', ANDROID, 'update'
         print 'Your PATH must include android tools.'
         sys.exit(-1)
@@ -272,7 +277,7 @@ def make_package(args):
     # Build.
     try:
         map(lambda arg: subprocess.call([ANT, arg]), args.command)
-    except IOError:
+    except (OSError, IOError):
         print 'An error occured while calling', ANT
         print 'Did you install ant on your system ?'
         sys.exit(-1)
