diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-08-02 12:30:55 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-08-02 12:30:59 +0200 |
| commit | 2f9bf6673179fc280142b666a9d13ce439c334ca (patch) | |
| tree | 4c7f5de2c118e15b9c4d445f338181d38824f585 /toolchain | |
| parent | 59b311bcc2eddad30e5d0d80bd7563a56236f771 (diff) | |
| download | extra-cmake-modules-2f9bf6673179fc280142b666a9d13ce439c334ca.tar.gz extra-cmake-modules-2f9bf6673179fc280142b666a9d13ce439c334ca.tar.bz2 | |
Android: Don't hardcode a random version of the Android SDK
Summary: Just default to whichever is installed
Test Plan: Built kalgebra
Reviewers: #frameworks, vkrause
Reviewed By: vkrause
Subscribers: alexeymin, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D14544
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Android.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index b6cce6c1..11687c7e 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -158,7 +158,10 @@ set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14") set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path") set(ANDROID_TOOLCHAIN "arm-linux-androideabi" CACHE string "Used SDK") set(ANDROID_COMPILER_PREFIX "arm-linux-androideabi" CACHE string "Prefix for gcc/g++/etc") -set(ANDROID_SDK_BUILD_TOOLS_REVISION "21.1.1" CACHE string "Android API Level") + +file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE ${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*) +list(GET build-tools 0 _default_sdk) +set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE string "Android API Level") set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API}) set(CMAKE_SYSTEM_NAME Android) |