Android: Nuke support for old NDKs

- Support NDK only r19+
- Remove deprecated and unsupported stl libs: "system", "gabi++_static",
"gabi++_shared", "stlport_static", "stlport_shared", "gnustl_static",
"gnustl_shared"
- Fix armv7a link (we need to link against libc++.[a/so].API)
- Use lldb
- Use llvm bin utils

[ChangeLog][Android] Support NDK only r19+, remove deprecated and
unsupported stl libs, use lldb and llvm bin utils

Change-Id: If9d5d5462dffb6c9bf481f910ee2c3ba03bc5649
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 8 insertions, 14 deletions

diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs
index 866d8dfe9..d11f8707a 100644
--- a/share/qbs/module-providers/Qt/templates/android_support.qbs
+++ b/share/qbs/module-providers/Qt/templates/android_support.qbs
@@ -24,6 +24,7 @@ Module {
     Depends { name: "Android.sdk"; condition: _enableSdkSupport }
     Depends { name: "Android.ndk"; condition: _enableNdkSupport }
     Depends { name: "java"; condition: _enableSdkSupport }
+    Depends { name: "cpp" }
 
     Properties {
         condition: _enableNdkSupport && qbs.toolchain.contains("clang")
@@ -38,6 +39,10 @@ Module {
         Android.sdk.customManifestProcessing: true
         java._tagJniHeaders: false // prevent rule cycle
     }
+    Properties {
+        condition: _enableNdkSupport && Android.ndk.abi === "armeabi-v7a"
+        cpp.defines: "ANDROID_HAS_WSTRING"
+    }
 
     Rule {
         condition: _enableSdkSupport
@@ -90,20 +95,9 @@ Module {
                 f.writeLine('"sdkBuildToolsRevision": "' + product.Android.sdk.buildToolsVersion
                             + '",');
                 f.writeLine('"ndk": "' + product.Android.sdk.ndkDir + '",');
-                // GCC was dropped in r19+
-                if (Utilities.versionCompare(product.Android.ndk.version, "19") >= 0) {
-                    f.writeLine('"toolchain-prefix": "llvm",');
-                    f.writeLine('"tool-prefix": "llvm",');
-                    f.writeLine('"useLLVM": true,');
-                } else {
-                    var toolPrefix = theBinary.cpp.toolchainTriple;
-                    var toolchainPrefix = toolPrefix.startsWith("i686-") ? "x86" : toolPrefix;
-                    f.writeLine('"toolchain-prefix": "' + toolchainPrefix + '",');
-                    f.writeLine('"tool-prefix": "' + toolPrefix + '",');
-                    f.writeLine('"toolchain-version": "' + theBinary.Android.ndk.toolchainVersion
-                                + '",');
-                }
-
+                f.writeLine('"toolchain-prefix": "llvm",');
+                f.writeLine('"tool-prefix": "llvm",');
+                f.writeLine('"useLLVM": true,');
                 f.writeLine('"ndk-host": "' + theBinary.Android.ndk.hostArch + '",');
                 f.writeLine('"target-architecture": "' + theBinary.Android.ndk.abi + '",');
                 f.writeLine('"qml-root-path": "' + product.Qt.android_support.qmlRootDir + '",');