diff options
| author | Memphiz <memphis@machzwo.de> | 2013-05-02 22:39:45 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-05-02 23:27:10 +0200 |
| commit | 515977b00123c27200cc170c297de094ad5987d0 (patch) | |
| tree | 79fbf07b61431073b7c46fd4ac782a37144767aa /tools | |
| parent | 57924e51b3b9da58e2cede94c69755654875796d (diff) | |
[jenkins] - obey the TARBALLS env variable for android builds
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/android/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/defaultenv | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends index 13ab6cdd53..ae8cd80e5e 100644 --- a/tools/buildsteps/android/configure-depends +++ b/tools/buildsteps/android/configure-depends @@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-tarballs=/opt/xbmc-tarballs \ + --with-tarballs=$TARBALLS \ --host=arm-linux-androideabi \ --with-sdk-path=$SDK_PATH \ --with-ndk=$NDK_PATH \ diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 0e0cf39f8e..7b379f7405 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -3,6 +3,8 @@ SDK_VERSION=${SDK_VERSION:-"Default"} Configuration=${Configuration:-"Default"} XBMC_DEPENDS_ROOT=${XBMC_DEPENDS_ROOT:-"Default"} PATH_CHANGE_REV_FILENAME=".last_success_revision" +#TARBALLS ENV-VAR is only used by android scripts atm +TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} #set platform defaults #$XBMC_PLATFORM_DIR matches the platform subdirs! |