Changeset 1df4b6c in subsurface


Ignore:
Timestamp:
May 27, 2017, 7:09:27 AM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
3d8c0b27
Parents:
0cf8ef6
git-author:
Jan Mulder <jlmulder@…> (05/25/17 10:15:51)
git-committer:
Dirk Hohndel <dirk@…> (05/27/17 07:09:27)
Message:

Android build: Add BUILDTOOLS_REVISION

The used cmake toolkit for building the Android Subsurface-mobile app
(qt-android-cmake) recently moved away from compiling with Ant in favor
of Gradle. The most recent Android SDK will not support Ant any more.

This calls for the addition of the Android SDK BUILDTOOLS_REVISION define
to the cmake of Subsurface-mobile. Without this, the build will fail.

The value has to be set to an existing directory in
.../android-sdk/build-tools/

Signed-off-by: Jan Mulder <jlmulder@…>

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r3a003f4c r1df4b6c  
    368368        add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET}
    369369                PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT}
     370                BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION}
    370371        )
    371372elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
  • packaging/android/build.sh

    • Property mode changed from 100644 to 100755
    rd82f8cb r1df4b6c  
    3939# Which arch should we build for?
    4040ARCH=arm
     41# Which SDK buildtools revision is used?
     42ANDROID_BUILDTOOLS_REVISION=23.0.3
    4143
    4244while [ "$#" -gt 0 ] ; do
     
    377379        -DANDROID_NATIVE_LIBSSL="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libssl.so" \
    378380        -DANDROID_NATIVE_LIBCRYPT="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libcrypto.so" \
     381        -DBUILDTOOLS_REVISION="$ANDROID_BUILDTOOLS_REVISION" \
    379382        "$SUBSURFACE_SOURCE"
    380383
Note: See TracChangeset for help on using the changeset viewer.