From 06061b0e3ce4342b5cbb1c0e6c8d285b524e30f0 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 16 Nov 2018 19:17:45 +0100 Subject: Android: improve clang support Summary: Infer the toolchain we are using through cmake's detection of ranlib instead of asking the user to fill it. It's only used in androiddeployqt and cmake expects it to be version "clang" for clang builds while androiddeployqt expects it to be "4.9". Reviewers: #build_system, #android, vkrause Reviewed By: #android, vkrause Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D16930 --- toolchain/Android.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'toolchain/Android.cmake') diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 74b1dbfc..76b3665a 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -42,12 +42,6 @@ # # Additional options are specified as cache variables (eg: on the command line): # -# ``ANDROID_TOOLCHAIN`` -# The toolchain to use. See the ``toolchains`` directory of the NDK. -# Default: ``arm-linux-androideabi``. -# ``ANDROID_COMPILER_PREFIX`` -# The prefix for the gcc and g++ executables. See the ``toolchains/$ANDROID_TOOLCHAIN/prebuilt/*/bin/*-gcc`` in the NDK. -# Default: ``arm-linux-androideabi``. # ``ANDROID_ABI`` # The ABI to use. See the ``sources/cxx-stl/gnu-libstdc++/*/libs`` # directories in the NDK. Default: ``armeabi-v7a``. @@ -156,8 +150,6 @@ set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a") 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") 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) -- cgit v1.2.1