diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-08-31 10:06:18 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-09-03 08:42:50 +0000 |
| commit | 604c03f0b96909ae086c9f5c5bc8f7eabc7f48fb (patch) | |
| tree | a9ae566bdd9989f4a6bb0b3fcaf4524c08ef9ecb /configure.pri | |
| parent | 5d0ee89132bd85d681d7b0840dcb5f01042237cc (diff) | |
Android: Default to android-21 NDK for arm64-v8a
The earlier NDK platforms do not support 64 bit architectures, so
configure would fail with a confusing message about problems in
the environment.
[ChangeLog][Android] Default to android-21 for arm64 builds instead
of failing.
Task-number: QTBUG-70280
Change-Id: Ib9846d6deee3d453fd4a17a3ae92306482d380ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 805b985fa6..a8ef2c27d4 100644 --- a/configure.pri +++ b/configure.pri @@ -604,6 +604,9 @@ defineTest(qtConfOutput_prepareOptions) { target_arch = armeabi-v7a platform = $$eval(config.input.android-ndk-platform) + isEmpty(platform): equals(target_arch, arm64-v8a): \ + platform = android-21 + isEmpty(platform): \ platform = android-16 ### the windows configure disagrees ... |