From 10505120d410106ca8e16528190e4fccf46b42a4 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 10 Jan 2011 08:31:35 +0000
Subject: [PATCH] Added ability to run ndk build script if the ant build
 doesn't do it

---
 README   |  2 ++
 build.py | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/README b/README
index 48ef06f1..ea618ea1 100644
--- a/README
+++ b/README
@@ -147,6 +147,8 @@ configuration to the build. These are:
 		   that.
  initfun=yes	   Enables a selection of mad hacks to make com.funambol.android
                    build. Probably not useful for any other application.
+ buildjni=yes      Enables building of native code via the ndk-build script before
+ 		   doing the main ant build.
 
 Another example, using extra parameters:
 
diff --git a/build.py b/build.py
index 27b667bb..2813041d 100644
--- a/build.py
+++ b/build.py
@@ -326,6 +326,17 @@ for app in apps:
                 tarball.add(build_dir, tarname)
                 tarball.close()
 
+                # Build native stuff if required...
+                if thisbuild.has_key('buildjni') and thisbuild['buildjni'] == 'yes':
+                    ndkbuild = os.path.join(ndk_path, "ndk-build")
+                    p = subprocess.Popen([ndkbuild], cwd=root_dir,
+                            stdout=subprocess.PIPE)
+                    output = p.communicate()[0]
+                    if p.returncode != 0:
+                        print output
+                        print "NDK build failed"
+                        sys.exit(1)
+
                 # Build the release...
                 if thisbuild.has_key('antcommand'):
                     antcommand = thisbuild['antcommand']
@@ -338,6 +349,7 @@ for app in apps:
                     print output
                     print "Build failed"
                     sys.exit(1)
+                print "Build successful"
 
                 # Find the apk name in the output...
                 if thisbuild.has_key('bindir'):