[PATCH 09/12] android: Enable config via env vars

[Anton Lundin]

This creates the possibility to pass configuration, where the ndk and
sdk is installed, to the build.sh script via environment variables.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 packaging/android/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 5c99c7b..80cae8e 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -27,7 +27,7 @@ else
 fi
 
 # Configure where we can find things here
-export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r12
+export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r12}
 
 if [ ! -z "$QT5_ANDROID" ] ; then
 	echo "Using Qt5 in $QT5_ANDROID"
@@ -43,10 +43,10 @@ else
 fi
 
 if [ $PLATFORM = Darwin ] ; then
-       export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-macosx
+       export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT-$SUBSURFACE_SOURCE/../android-sdk-macosx}
        export ANDROID_NDK_HOST=darwin-x86_64
 else
-       export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-linux
+       export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT-$SUBSURFACE_SOURCE/../android-sdk-linux}
        export ANDROID_NDK_HOST=linux-x86
 fi
 
-- 
2.7.4