From c32286ea3292c2c58e0f9d59ec7d520fa19837c4 Mon Sep 17 00:00:00 2001
From: Memphiz <memphis@machzwo.de>
Date: Sun, 26 Oct 2014 18:37:51 +0100
Subject: [PATCH] [jenkins/android] - allow to build OBB package via jenkins
 env_var

---
 tools/buildsteps/android/package    | 15 ++++++++++++---
 tools/buildsteps/androidx86/package | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/tools/buildsteps/android/package b/tools/buildsteps/android/package
index b38dabcdafaf6..4a9f52d31e7d5 100644
--- 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
index d6aca6476e147..5dd711f9b0389 100644
--- 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