From b2b29c00ecc1fe63947d97fe0d09b23fe196ff01 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 23 Jun 2016 22:56:34 +0200 Subject: android: Enable config via env vars 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 Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging/android/build.sh') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 5c99c7b21..80cae8e21 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 -- cgit v1.2.3-70-g09d2