diff options
Diffstat (limited to 'share/qbs/modules/Android/ndk')
-rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 10 | ||||
-rw-r--r-- | share/qbs/modules/Android/ndk/utils.js | 6 |
2 files changed, 5 insertions, 11 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; } |