[jenkins] - obey the TARBALLS env variable for android builds

xbmc · May 2, 2013 · 515977b · 515977b
1 parent 57924e5
commit 515977b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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!