diff options
| author | Memphiz <memphis@machzwo.de> | 2016-04-02 11:15:32 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-04-02 11:15:32 +0200 |
| commit | ec4f8dcf5f5e29fd073a0a2aedb37cac351d2116 (patch) | |
| tree | 7cd3d709f6615575fca3484b702d7fdd780a9093 /tools | |
| parent | b41722d2f978e20efbfa4bcd07b7bf1401e24560 (diff) | |
[jenkins/android] - fixed hashcalculation now that TOOLCHAIN_X86 is gone
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/android/configure-depends | 8 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/configure-depends | 8 | ||||
| -rw-r--r-- | tools/buildsteps/defaultenv | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends index 746c11f73d..cb9dd9366f 100644 --- a/tools/buildsteps/android/configure-depends +++ b/tools/buildsteps/android/configure-depends @@ -4,8 +4,8 @@ XBMC_PLATFORM_DIR=android NDK_ARCH="arm" #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 +NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then @@ -13,9 +13,9 @@ then --with-tarballs=$TARBALLS \ --host=arm-linux-androideabi \ --with-sdk-path=$SDK_PATH \ - --with-ndk=$CURRENT_NDK_PATH \ + --with-ndk=$NDK_PATH \ $(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \ - --with-toolchain=$CURRENT_TOOLCHAIN \ + --with-toolchain=$TOOLCHAIN \ --prefix=$XBMC_DEPENDS_ROOT \ --enable-neon fi diff --git a/tools/buildsteps/androidx86/configure-depends b/tools/buildsteps/androidx86/configure-depends index 5c35987fad..69b2309845 100644 --- a/tools/buildsteps/androidx86/configure-depends +++ b/tools/buildsteps/androidx86/configure-depends @@ -4,8 +4,8 @@ XBMC_PLATFORM_DIR=android 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 +NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +TOOLCHAIN=$ANDROID_DEV_ROOT/android-toolchain-$NDK_ARCH-$SDK_VERSION-r$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then @@ -13,8 +13,8 @@ then --with-tarballs=$TARBALLS \ --host=i686-linux-android \ --with-sdk-path=$SDK_PATH \ - --with-ndk=$CURRENT_NDK_PATH \ + --with-ndk=$NDK_PATH \ $(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \ - --with-toolchain=$CURRENT_TOOLCHAIN \ + --with-toolchain=$TOOLCHAIN \ --prefix=$XBMC_DEPENDS_ROOT fi diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index e672a1d7e8..6d620abf61 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -75,7 +75,7 @@ fi #helper functions -#hash a dir based on the git revision, SDK_PATH, NDK_PATH, NDK_VERSION, SDK_VERSION, TOOLCHAIN TOOLCHAIN_X86 (for droidx86) and XBMC_DEPENDS_ROOT +#hash a dir based on the git revision, SDK_PATH, NDK_PATH, NDK_VERSION, SDK_VERSION, TOOLCHAIN and XBMC_DEPENDS_ROOT #param1 path to be hashed function getBuildHash () { @@ -83,7 +83,7 @@ function getBuildHash () checkPath="$1" local hashStr hashStr="$(git rev-list HEAD --max-count=1 -- $checkPath)" - hashStr="$hashStr $SDK_PATH $NDK_PATH $NDK_VERSION $SDK_VERSION $TOOLCHAIN $TOOLCHAIN_X86 $XBMC_DEPENDS_ROOT" + hashStr="$hashStr $SDK_PATH $NDK_PATH $NDK_VERSION $SDK_VERSION $TOOLCHAIN $XBMC_DEPENDS_ROOT" echo $hashStr } |