diff --git a/AddQtAndroidApk.cmake b/AddQtAndroidApk.cmake index 7093822..02bac4e 100644 --- a/AddQtAndroidApk.cmake +++ b/AddQtAndroidApk.cmake @@ -77,7 +77,7 @@ include(CMakeParseArguments) macro(add_qt_android_apk TARGET SOURCE_TARGET) # parse the macro arguments - cmake_parse_arguments(ARG "INSTALL" "NAME;VERSION_CODE;PACKAGE_NAME;PACKAGE_SOURCES;KEYSTORE_PASSWORD" "DEPENDS;KEYSTORE" ${ARGN}) + cmake_parse_arguments(ARG "INSTALL" "NAME;VERSION_CODE;PACKAGE_NAME;PACKAGE_SOURCES;KEYSTORE_PASSWORD;BUILDTOOLS_REVISION" "DEPENDS;KEYSTORE" ${ARGN}) # check the configuration if(CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -107,6 +107,13 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET) set(QT_ANDROID_APP_PACKAGE_NAME org.qtproject.${SOURCE_TARGET}) endif() + # set the Android SDK build-tools revision + if(ARG_BUILDTOOLS_REVISION) + set(QT_ANDROID_SDK_BUILDTOOLS_REVISION ${ARG_BUILDTOOLS_REVISION}) + else() + set(QT_ANDROID_SDK_BUILDTOOLS_REVISION "") + endif() + # define the application source package directory if(ARG_PACKAGE_SOURCES) set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT ${ARG_PACKAGE_SOURCES}) diff --git a/qtdeploy.json.in b/qtdeploy.json.in index c554207..af05203 100644 --- a/qtdeploy.json.in +++ b/qtdeploy.json.in @@ -3,6 +3,7 @@ "qt": "@QT_ANDROID_QT_ROOT@", "sdk": "@QT_ANDROID_SDK_ROOT@", "ndk": "@QT_ANDROID_NDK_ROOT@", + "sdkBuildToolsRevision": "@QT_ANDROID_SDK_BUILDTOOLS_REVISION@", "toolchain-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@", "tool-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@", "toolchain-version": "@ANDROID_COMPILER_VERSION@",