diff options
| author | Memphiz <memphis@machzwo.de> | 2015-01-23 13:37:43 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2015-01-23 19:04:13 +0100 |
| commit | bdc80fec39a40ae46c897264f2b59420a43d5b7e (patch) | |
| tree | 7fd274bd1622bde6672a170920d4e33f57a914d1 /tools/buildsteps/androidx86 | |
| parent | 52ff0d56a47ec2e3eb411706009c0dd1f484896f (diff) | |
[jenkins/droid] - allow to select the ndk version through jenkins jobs and bump to ndk r10d
Diffstat (limited to 'tools/buildsteps/androidx86')
| -rw-r--r-- | tools/buildsteps/androidx86/configure-depends | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/buildsteps/androidx86/configure-depends b/tools/buildsteps/androidx86/configure-depends index 9fc2ad876f..89fd36f34b 100644 --- a/tools/buildsteps/androidx86/configure-depends +++ b/tools/buildsteps/androidx86/configure-depends @@ -2,14 +2,19 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv +NDK_ARCH=x86 +#the following pathes must exist on the slave and use the defined scheme here! +CURRENT_NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +CURRENT_TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION + if [ "$(rebuildDepends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ --with-tarballs=$TARBALLS \ --host=i686-linux-android \ --with-sdk-path=$SDK_PATH \ - --with-ndk=$NDK_PATH \ + --with-ndk=$CURRENT_NDK_PATH \ $(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \ - --with-toolchain=$TOOLCHAIN_X86 \ + --with-toolchain=$CURRENT_TOOLCHAIN \ --prefix=$XBMC_DEPENDS_ROOT fi |