diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-08-28 08:31:00 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2019-08-30 22:29:14 +0300 |
| commit | 65dfc485adc1c5de4840f217c47c6ad79d26ae82 (patch) | |
| tree | c93df791659dde48ff5bdab6ddc5c513b326f198 | |
| parent | fc49d73c44463d35c9cd0753e678e9ebcf668fe4 (diff) | |
Android: clean configure params for android
-android-toolchain-version is not needed anymore as we are using exclusively the llvm toolchain.
Change-Id: Ia033297a6a2c968352c364758eb1436380a5f96e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | config_help.txt | 1 | ||||
| -rw-r--r-- | configure.json | 1 | ||||
| -rw-r--r-- | configure.pri | 12 | ||||
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 1 |
4 files changed, 2 insertions, 13 deletions
diff --git a/config_help.txt b/config_help.txt index 5880c1e00d..e47fc9adb7 100644 --- a/config_help.txt +++ b/config_help.txt @@ -205,7 +205,6 @@ Build environment: [$ANDROID_NDK_HOST] -android-abis ....... Comma separated Android abis, default is: armeabi-v7a,arm64-v8a,x86,x86_64 - -android-toolchain-version ... Set Android toolchain version -android-style-assets Automatically extract style assets from the device at run time. This option makes the Android style behave correctly, but also makes the Android platform plugin diff --git a/configure.json b/configure.json index c6ea80b076..5fc35a1658 100644 --- a/configure.json +++ b/configure.json @@ -56,7 +56,6 @@ "android-ndk-host": "string", "android-ndk-platform": "string", "android-sdk": "string", - "android-toolchain-version": "string", "android-style-assets": "boolean", "appstore-compliant": "boolean", diff --git a/configure.pri b/configure.pri index d803dcf086..ecd46b8e38 100644 --- a/configure.pri +++ b/configure.pri @@ -573,14 +573,7 @@ defineTest(qtConfOutput_prepareOptions) { qtConfFatalError("Cannot find Android NDK." \ "Please use -android-ndk option to specify one.") - ndk_tc_ver = $$eval(config.input.android-toolchain-version) - isEmpty(ndk_tc_ver): \ - ndk_tc_ver = 4.9 - !exists($$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt/*): \ - qtConfFatalError("Cannot detect Android NDK toolchain." \ - "Please use -android-toolchain-version to specify it.") - - ndk_tc_pfx = $$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt + ndk_tc_pfx = $$ndk_root/toolchains/llvm/prebuilt ndk_host = $$eval(config.input.android-ndk-host) isEmpty(ndk_host): \ ndk_host = $$getenv(ANDROID_NDK_HOST) @@ -632,8 +625,7 @@ defineTest(qtConfOutput_prepareOptions) { "DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \ "DEFAULT_ANDROID_PLATFORM = $$platform" \ "DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \ - "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')" \ - "DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION = $$ndk_tc_ver" + "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')" } export($${currentConfig}.output.devicePro) diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 998a985bb5..4d6101e297 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -71,4 +71,3 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT)|error() } - |