mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: Enable config via env vars

Browse source 
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>
This commit is contained in:
Anton Lundin 2016-06-23 22:56:34 +02:00 • committed by Dirk Hohndel
parent 7386d0b5b4
commit b2b29c00ec
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packaging/android/build.sh
View file

@ -27,7 +27,7 @@ else
fi fi
# Configure where we can find things here # 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 if [ ! -z "$QT5_ANDROID" ] ; then
echo "Using Qt5 in $QT5_ANDROID" echo "Using Qt5 in $QT5_ANDROID"
@ -43,10 +43,10 @@ else
fi fi
if [ $PLATFORM = Darwin ] ; then 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 export ANDROID_NDK_HOST=darwin-x86_64
else 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 export ANDROID_NDK_HOST=linux-x86
fi fi