diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2016-06-23 22:56:34 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-06-23 16:35:21 -0700 |
| commit | b2b29c00ecc1fe63947d97fe0d09b23fe196ff01 (patch) | |
| tree | b0e924942a8665929cd82377fe0e4f32853c8e6b /packaging | |
| parent | 7386d0b5b4dbfbc10434a51febd048e564c34408 (diff) | |
| download | subsurface-b2b29c00ecc1fe63947d97fe0d09b23fe196ff01.tar.gz | |
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 <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |