[tor-commits] [orbot/master] make-release-build: make sure ndk-build can be found

[n8fr8 at torproject.org]

commit 5c86b5cc7ea9ee84c4dc6d84d8acaff955e21eb6
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Thu Jan 14 21:08:46 2016 +0100

    make-release-build: make sure ndk-build can be found
---
 make-release-build |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/make-release-build b/make-release-build
index 2d5947a..ee48d17 100755
--- a/make-release-build
+++ b/make-release-build
@@ -35,6 +35,15 @@ if [ -z $ANDROID_HOME ]; then
     fi
 fi
 
+if [ -z $ANDROID_NDK_HOME ]; then
+    if which ndk-build 2>&1 /dev/null; then
+        ANDROID_NDK_HOME=`which ndk-build |  sed 's,/ndk-build,,'`
+    else
+        echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH"
+        exit
+    fi
+fi
+
 projectroot=`pwd`
 projectname=`sed -n 's,.*name="app_name">\(.*\)<.*,\1,p' res/values/strings.xml`
 
@@ -61,7 +70,7 @@ else
     echo "skipping release ant.properties"
 fi
 
-ndk-build
+$ANDROID_NDK_HOME/ndk-build
 
 faketime "$TIMESTAMP" make -C external