diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-05-27 14:52:38 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-06-05 17:43:40 +0200 |
| commit | bc237a887da176dc35f7ae9632865c7a76d85d6f (patch) | |
| tree | bb16274a81d0c636cae3fdbb1538c6f7dc5447db /tools/buildsteps/androidx86 | |
| parent | 568b1b4bdaaa046e951d1a71ed273a92271a3cba (diff) | |
[cmake] Android Packaging
Diffstat (limited to 'tools/buildsteps/androidx86')
| -rw-r--r-- | tools/buildsteps/androidx86/make-binary-addons | 9 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/package | 19 |
2 files changed, 18 insertions, 10 deletions
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons index e3e189932a..0ef6c3d142 100644 --- a/tools/buildsteps/androidx86/make-binary-addons +++ b/tools/buildsteps/androidx86/make-binary-addons @@ -15,7 +15,14 @@ then do echo "building $addon" git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon - cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 || ALL_BINARY_ADDONS_BUILT="0" + + if [ "$CMAKE_BUILD" = true ]; then + # Must match prefix in android/PathSetup.cmake + INSTALL_PREFIX="../../../../../build/install" + else + INSTALL_PREFIX="\$(PREFIX)" + fi + cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 INSTALL_PREFIX="$INSTALL_PREFIX" || ALL_BINARY_ADDONS_BUILT="0" done fi diff --git a/tools/buildsteps/androidx86/package b/tools/buildsteps/androidx86/package index b7d400008f..19249c688f 100644 --- a/tools/buildsteps/androidx86/package +++ b/tools/buildsteps/androidx86/package @@ -2,25 +2,26 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -# Temporarily disabled because packaging not implement for CMake -if [ "$CMAKE_BUILD" = true ]; then - exit 0 +if [ "x$BUILD_OBB" == "xtrue" ]; then + TARGET=apk-obb-unsigned +else + TARGET=apk-unsigned fi -if [ "x$BUILD_OBB" == "xtrue" ] -then - cd $WORKSPACE;make apk-obb-unsigned +if [ "$CMAKE_BUILD" = true ]; then + cd $WORKSPACE/build;make -j$BUILDTHREADS $TARGET else - cd $WORKSPACE;make apk-unsigned + cd $WORKSPACE;make -j$BUILDTHREADS $TARGET fi $RUN_SIGNSTEP +mv tools/android/packaging/Kodi.symbols*.tar.bz2 $WORKSPACE/ +cd $WORKSPACE #rename for upload #e.x. xbmc-20130314-8c2fb31-Frodo-x86.apk UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-x86" mv kodiapp-x86-*.apk $UPLOAD_FILENAME.apk -if [ -f *.obb ] +if [ -f *.obb ] then mv *.obb $UPLOAD_FILENAME.obb fi -mv tools/android/packaging/Kodi.symbols*.tar.bz2 $WORKSPACE/ |