[jenkins/android] - allow to build OBB package via jenkins env_var

Memphiz · Oct 26, 2014 · c32286e · c32286e
1 parent 677786b
commit c32286e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/tools/buildsteps/android/package b/tools/buildsteps/android/package
@@ -2,10 +2,19 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE;make apk-unsigned
+if [ "x$BUILD_OBB" != "x" ]
+then
+  cd $WORKSPACE;make apk-obb-unsigned
+else
+  cd $WORKSPACE;make apk-unsigned
+fi
 $RUN_SIGNSTEP
 
 #rename for upload
 #e.x. xbmc-20130314-8c2fb31-Frodo-armeabi-v7a.apk
-UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-armeabi-v7a.apk"
-mv kodiapp-armeabi-*.apk $UPLOAD_FILENAME
+UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-armeabi-v7a"
+mv kodiapp-armeabi-*.apk $UPLOAD_FILENAME.apk
+if [ -f *.obb ]
+then
+  mv *.obb $UPLOAD_FILENAME.obb
+fi
diff --git a/tools/buildsteps/androidx86/package b/tools/buildsteps/androidx86/package
@@ -2,10 +2,19 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE;make apk-unsigned
+if [ "x$BUILD_OBB" != "x" ]
+then
+  cd $WORKSPACE;make apk-obb-unsigned
+else
+  cd $WORKSPACE;make apk-unsigned
+fi
 $RUN_SIGNSTEP
 
 #rename for upload
 #e.x. xbmc-20130314-8c2fb31-Frodo-x86.apk
-UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-x86.apk"
-mv kodiapp-x86-*.apk $UPLOAD_FILENAME
+UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-x86"
+mv kodiapp-x86-*.apk $UPLOAD_FILENAME.apk
+if [ -f *.obb ] 
+then
+  mv *.obb $UPLOAD_FILENAME.obb
+fi