aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2013-05-02 22:41:59 +0200
committerMemphiz <memphis@machzwo.de>2013-05-02 23:27:10 +0200
commite87956e993a70a1c8fd0b46e30b3e8c547501a7e (patch)
tree332c96b0a925303dc289250245b01747784ec98a
parentb88b07ccfd7626ec6a74937805c4d354ff0ae24b (diff)
[jenkins] - only explicitly set the android sdk version if its not set to "Default" (in which case configure uses the prefered version)
-rw-r--r--tools/buildsteps/android/configure-depends2
-rw-r--r--tools/buildsteps/defaultenv2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends
index ae8cd80e5e..73f9be569f 100644
--- a/tools/buildsteps/android/configure-depends
+++ b/tools/buildsteps/android/configure-depends
@@ -9,7 +9,7 @@ then
--host=arm-linux-androideabi \
--with-sdk-path=$SDK_PATH \
--with-ndk=$NDK_PATH \
- --with-sdk=android-$SDK_VERSION \
+ $(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \
--with-toolchain=$TOOLCHAIN \
--prefix=$XBMC_DEPENDS_ROOT
fi
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv
index 5fdf7d4764..bbdcb29c90 100644
--- a/tools/buildsteps/defaultenv
+++ b/tools/buildsteps/defaultenv
@@ -34,7 +34,7 @@ case $XBMC_PLATFORM_DIR in
;;
android)
- DEFAULT_SDK_VERSION=10
+ DEFAULT_SDK_VERSION="Default"
DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
DEFAULT_CONFIGURATION="Debug"
;;