diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-12-06 13:13:47 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-06 21:53:02 +0100 |
| commit | 6c872931d581cb6c3cf3565a36764be3c6b9783f (patch) | |
| tree | 18b4e1cd7252e719d368342ca1eebb976b500e01 | |
| parent | 4bfcf12c1745e5f601ee948e82a2726df37f4453 (diff) | |
| download | subsurface-6c872931d581cb6c3cf3565a36764be3c6b9783f.tar.gz | |
Android build: buildtools version is automatically detected
With commit 0d8fc7ef970e of qt-android-cmake, the buildtools version
is automatically detected. So do not try to pass it any more, as
this breaks the build.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | packaging/android/build.sh | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc383d98..1556707e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,14 +411,12 @@ if(ANDROID) if((DEFINED ENV{KEYSTORE}) AND (DEFINED ENV{KEYSTORE_PASSWORD})) add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET} PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT} - BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION} KEYSTORE $ENV{KEYSTORE} Subsurface-mobile KEYSTORE_PASSWORD $ENV{KEYSTORE_PASSWORD} ) message(STATUS "KEYSTORE=$ENV{KEYSTORE} KEYSTORE_PASSWORD=$ENV{KEYSTORE_PASSWORD}") else() add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET} PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT} - BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION} ) message(STATUS "no KEYSTORE") endif() diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 99c33b1bc..81db27488 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -416,7 +416,6 @@ cmake $MOBILE_CMAKE \ -DFTDISUPPORT=${FTDI} \ -DANDROID_NATIVE_LIBSSL="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libssl.so" \ -DANDROID_NATIVE_LIBCRYPT="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libcrypto.so" \ - -DBUILDTOOLS_REVISION="$ANDROID_BUILDTOOLS_REVISION" \ -DCMAKE_MAKE_PROGRAM="make" \ "$SUBSURFACE_SOURCE" |