diff options
author | BogDan Vatra <bogdan@kde.org> | 2019-04-25 17:02:01 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2019-04-26 09:27:48 +0000 |
commit | 5b0271905f491205c6c70eaa33b2c429c13f4536 (patch) | |
tree | ce11f9894fbd7ebc5e238698616eace67cadbe47 /share/qbs/modules | |
parent | b381775da143b8b9b5ac610bfd38485d341d7c19 (diff) |
Android: Nuke mips[64] abi support
Mips' abis were removed long time ago from the Android NDK
Change-Id: I8d006b6758ee4faa7f2d697a7252981470d43e1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
-rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 10 | ||||
-rw-r--r-- | share/qbs/modules/Android/ndk/utils.js | 6 | ||||
-rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index 15cfb8f72..3b104558c 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -47,8 +47,8 @@ Module { readonly property string abi: NdkUtils.androidAbi(qbs.architecture) PropertyOptions { name: "abi" - description: "Corresponds to the 'APP_ABI' variable in an Android.mk file." - allowedValues: ["arm64-v8a", "armeabi", "armeabi-v7a", "mips", "mips64", "x86", "x86_64"] + description: "Supported Android ABIs" + allowedValues: ["arm64-v8a", "armeabi", "armeabi-v7a", "x86", "x86_64"] } // See https://developer.android.com/ndk/guides/cpp-support.html @@ -85,10 +85,10 @@ Module { property stringList abis: { var list = ["armeabi", "armeabi-v7a"]; - if (platformVersion >= 9) - list.push("mips", "x86"); + if (platformVersion >= 16) + list.push("x86"); if (platformVersion >= 21) - list.push("arm64-v8a", "mips64", "x86_64"); + list.push("arm64-v8a", "x86_64"); return list; } diff --git a/share/qbs/modules/Android/ndk/utils.js b/share/qbs/modules/Android/ndk/utils.js index dd3c95687..739c205ae 100644 --- a/share/qbs/modules/Android/ndk/utils.js +++ b/share/qbs/modules/Android/ndk/utils.js @@ -52,12 +52,6 @@ function androidAbi(arch) { case "armv7": case "armv7a": return "armeabi-v7a"; - case "mips": - case "mipsel": - return "mips"; - case "mips64": - case "mips64el": - return "mips64"; default: return arch; } diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 99865f8c6..7642b246a 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -113,7 +113,7 @@ LinuxGCC { libraryPaths: { var prefix = FileInfo.joinPaths(sysroot, "usr"); var paths = []; - if (Android.ndk.abi === "mips64" || Android.ndk.abi === "x86_64") // no lib64 for arm64-v8a + if (Android.ndk.abi === "x86_64") // no lib64 for arm64-v8a paths.push(FileInfo.joinPaths(prefix, "lib64")); paths.push(FileInfo.joinPaths(prefix, "lib")); paths.push(stlLibsDir); @@ -165,12 +165,6 @@ LinuxGCC { return qbs.architecture; case "x86": return "i686"; - case "mips": - case "mipsel": - return "mipsel"; - case "mips64": - case "mips64el": - return "mips64el"; } } |