Android: Update support to qt 5.14 and multi-arch apks for Qt apps

Before qt 5.14.
The profile property "moduleProviders.Qt.qmakeFilePaths" is set with one or more
paths to the different android architectures. Each qmake path belongs to a
different android architecture installation.
So each qmake is used to generated the Qt module corresponding to the architecture.

Although qbs can generate multi-arch apks using multiplex mode, this is not
possible when the project depends on qt libraries. This is because of the
restriction of the qt tool androiddeployqt used by qbs.

Now with qt 5.14.
All android architectures are installed in the same directory.
So the profile property "moduleProviders.Qt.qmakeFilePaths" is set with one
qmake path.

This directly impacts the qbs-setup-android tool and the generation of
the Qt modules.

Because qt libraries are installed in the the same directory, they have the
abi in their name (libQt5Core_armeabi-v7a.so).
So the rules that generate the apks are also impacted.

The new androiddeployqt have a new interface (json config file format and requires
to have the input libraries installed in the deployment directory) which allows
the generation of multi-arch apks.
So Qt.android_support modules needs to be updated as well.

Fixes: QBS-1497
Change-Id: Ibd546f356c38a05f42dfcac0a4ec92bd82d6f700
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 254 insertions, 67 deletions

diff --git a/tests/auto/blackbox/find/find-android.qbs b/tests/auto/blackbox/find/find-android.qbs
index 26dedc60f..de5c78d10 100644
--- a/tests/auto/blackbox/find/find-android.qbs
+++ b/tests/auto/blackbox/find/find-android.qbs
@@ -3,12 +3,23 @@ import qbs.TextFile
 Product {
     property string packageName: ""
     qbs.targetPlatform: "android"
+    multiplexByQbsProperties: ["architectures"]
+
+    Properties {
+        condition: qbs.architectures && qbs.architectures.length > 1
+        aggregate: true
+        multiplexedType: "json_arch"
+    }
 
     Depends { name: "Android.sdk"; required: false }
     Depends { name: "Android.ndk"; required: false }
     type: ["json"]
+
     Rule {
         multiplex: true
+        property stringList inputTags: "json_arch"
+        inputsFromDependencies: inputTags
+        inputs: product.aggregate ? [] : inputTags
         Artifact {
             filePath: ["android.json"]
             fileTags: ["json"]
@@ -18,17 +29,50 @@ Product {
             cmd.description = output.filePath;
             cmd.sourceCode = function() {
                 var tools = {};
+
+                for (var i in inputs["json_arch"]) {
+                    var tf = new TextFile(inputs["json_arch"][i].filePath, TextFile.ReadOnly);
+                    var json = JSON.parse(tf.readAll());
+                    tools["ndk"] = json["ndk"];
+                    tools["ndk-samples"] = json["ndk-samples"];
+                    tf.close();
+                }
+
                 if (product.moduleProperty("Android.sdk", "present")) {
                     tools["sdk"] = product.moduleProperty("Android.sdk", "sdkDir");
                     tools["sdk-build-tools-dx"] = product.Android.sdk.dxFilePath;
                 }
 
+                if (product.java && product.java.present)
+                    tools["jar"] = product.java.jarFilePath;
+
+                var tf;
+                try {
+                    tf = new TextFile(output.filePath, TextFile.WriteOnly);
+                    tf.writeLine(JSON.stringify(tools, undefined, 4));
+                } finally {
+                    if (tf)
+                        tf.close();
+                }
+            };
+            return cmd;
+        }
+    }
+    Rule {
+        multiplex: true
+        Artifact {
+            filePath: ["android_arch.json"]
+            fileTags: ["json_arch"]
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand();
+            cmd.description = output.filePath;
+            cmd.sourceCode = function() {
+                var tools = {};
                 if (product.moduleProperty("Android.ndk", "present")) {
                     tools["ndk"] = product.moduleProperty("Android.ndk", "ndkDir");
                     tools["ndk-samples"] = product.Android.ndk.ndkSamplesDir;
                 }
-                if (product.java && product.java.present)
-                    tools["jar"] = product.java.jarFilePath;
 
                 var tf;
                 try {
@@ -43,3 +87,4 @@ Product {
         }
     }
 }
+
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index 371d15f10..eb0303a07 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -79,7 +79,7 @@ void TestBlackboxAndroid::android()
     QFETCH(QString, projectDir);
     QFETCH(QStringList, productNames);
     QFETCH(QList<QByteArrayList>, expectedFilesLists);
-    QFETCH(QStringList, customProperties);
+    QFETCH(QStringList, qmlAppCustomProperties);
 
     const SettingsPtr s = settings();
     Profile p(theProfileName(projectDir == "qml-app"), s.get());
@@ -110,7 +110,7 @@ void TestBlackboxAndroid::android()
         auto currentExpectedFilesLists = expectedFilesLists;
         const QString configArgument = "config:" + configName;
         QbsRunParameters resolveParams("resolve");
-        resolveParams.arguments << configArgument << customProperties;
+        resolveParams.arguments << configArgument << qmlAppCustomProperties;
         resolveParams.profile = p.name();
         QCOMPARE(runQbs(resolveParams), 0);
         QbsRunParameters buildParams(QStringList{"--command-echo-mode", "command-line",
@@ -206,14 +206,41 @@ void TestBlackboxAndroid::android_data()
                 .toString() == "clang";
         return QByteArray("lib/${ARCH}/") + (usesClang ? "libc++_shared.so" : oldcxxLib);
     };
-    const QByteArrayList archsForQt = { pQt.value("qbs.architecture").toString().toUtf8() };
-    QByteArrayList ndkArchsForQt = archsForQt;
-    if (ndkArchsForQt.first() == "armv7a")
-        ndkArchsForQt.first() = "armeabi-v7a";
-    else if (ndkArchsForQt.first() == "armv5te")
-        ndkArchsForQt.first() = "armeabi";
-    else if (ndkArchsForQt.first() == "arm64")
-        ndkArchsForQt.first() = "arm64-v8a";
+
+    bool usingOldQt = true;
+    QStringList qmakeFilePaths = pQt.value(QStringLiteral("moduleProviders.Qt.qmakeFilePaths")).
+            toStringList();
+    if (qmakeFilePaths.size() == 1) {
+        qbs::Version version = TestBlackboxBase::qmakeVersion(qmakeFilePaths[0]);
+        if (version.isValid() && version >= qbs::Version(5, 14))
+            usingOldQt = false;
+    }
+
+    QByteArrayList archsForQt;
+    if (usingOldQt) {
+        archsForQt = { pQt.value("qbs.architecture").toString().toUtf8() };
+        if (archsStringList.empty())
+            archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs
+    } else {
+        QStringList archsForQtStringList = pQt.value(QStringLiteral("qbs.architectures"))
+                .toStringList();
+        if (archsForQtStringList.empty())
+            archsForQtStringList << pQt.value("qbs.architecture").toString();
+        std::transform(archsForQtStringList.begin(),
+                       archsForQtStringList.end(),
+                       std::back_inserter(archsForQt),
+                       [] (const QString &s) {
+            return s.toUtf8();
+        });
+    }
+
+    QByteArrayList ndkArchsForQt;
+    std::transform(archsForQt.begin(), archsForQt.end(), std::back_inserter(ndkArchsForQt),
+                   [] (const QString &s) {
+        return s.toUtf8().replace("armv7a", "armeabi-v7a")
+                .replace("armv5te", "armeabi")
+                .replace("arm64", "arm64-v8a");
+    });
 
     auto expandArchs = [] (const QByteArrayList &archs, const QByteArrayList &lst) {
         const QByteArray &archPlaceHolder = "${ARCH}";
@@ -237,7 +264,7 @@ void TestBlackboxAndroid::android_data()
     QTest::addColumn<QString>("projectDir");
     QTest::addColumn<QStringList>("productNames");
     QTest::addColumn<QList<QByteArrayList>>("expectedFilesLists");
-    QTest::addColumn<QStringList>("customProperties");
+    QTest::addColumn<QStringList>("qmlAppCustomProperties");
     QTest::newRow("teapot")
             << "teapot" << QStringList("TeapotNativeActivity")
             << (QList<QByteArrayList>() << commonFiles + expandArchs(archs, {
@@ -257,9 +284,12 @@ void TestBlackboxAndroid::android_data()
                        "lib/${ARCH}/libdependency.so"}))
             << QStringList{"products.minimalnative.multiplexByQbsProperties:[]",
                            "modules.qbs.architecture:" + archsStringList.first()};
-    QTest::newRow("qml app")
-            << "qml-app" << QStringList("qmlapp")
-            << (QList<QByteArrayList>() << commonFiles + expandArchs(ndkArchsForQt, {
+    QByteArrayList qmlAppExpectedFiles;
+    QByteArrayList qmlAppMinistroExpectedFiles;
+    QByteArrayList qmlAppCustomMetaDataExpectedFiles;
+    QStringList qmlAppCustomProperties;
+    if (usingOldQt) {
+        qmlAppExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
                        "resources.arsc",
                        "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/plugins.qmltypes",
                        "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/qmldir",
@@ -298,64 +328,157 @@ void TestBlackboxAndroid::android_data()
                        "lib/${ARCH}/libQt5QuickParticles.so",
                        "lib/${ARCH}/libQt5Quick.so",
                        "lib/${ARCH}/libqmlapp.so",
-                       "res/layout/splash.xml"}))
-                << QStringList{"modules.Android.sdk.automaticSources:false",
-                               "modules.qbs.architecture:" + archsForQt.first()};
-    QTest::newRow("qml app using Ministro")
-            << "qml-app" << QStringList("qmlapp")
-            << (QList<QByteArrayList>() << commonFiles + expandArchs(ndkArchsForQt, {
+                       "res/layout/splash.xml"});
+        qmlAppMinistroExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
+                        "resources.arsc",
+                        "assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list",
+                        "lib/${ARCH}/libgdbserver.so",
+                        cxxLibPath("libgnustl_shared.so", true),
+                        "lib/${ARCH}/libqmlapp.so",
+                        "res/layout/splash.xml"});
+        qmlAppCustomMetaDataExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
+                        "resources.arsc",
+                        "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/plugins.qmltypes",
+                        "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/qmldir",
+                        "assets/--Added-by-androiddeployqt--/qml/QtQuick/Window.2/plugins.qmltypes",
+                        "assets/--Added-by-androiddeployqt--/qml/QtQuick/Window.2/qmldir",
+                        "assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list",
+                        "assets/dummyasset.txt",
+                        "lib/${ARCH}/libgdbserver.so",
+                        cxxLibPath("libgnustl_shared.so", true),
+                        "lib/${ARCH}/libplugins_bearer_libqandroidbearer.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqgif.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqicns.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqico.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqjpeg.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqtga.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqtiff.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqwbmp.so",
+                        "lib/${ARCH}/libplugins_imageformats_libqwebp.so",
+                        "lib/${ARCH}/libplugins_platforms_android_libqtforandroid.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_debugger.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_inspector.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_local.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_messages.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_native.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_nativedebugger.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_profiler.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_preview.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_quickprofiler.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_server.so",
+                        "lib/${ARCH}/libplugins_qmltooling_libqmldbg_tcp.so",
+                        "lib/${ARCH}/libqml_QtQuick.2_libqtquick2plugin.so",
+                        "lib/${ARCH}/libqml_QtQuick_Window.2_libwindowplugin.so",
+                        "lib/${ARCH}/libQt5Core.so",
+                        "lib/${ARCH}/libQt5Gui.so",
+                        "lib/${ARCH}/libQt5Network.so",
+                        "lib/${ARCH}/libQt5Qml.so",
+                        "lib/${ARCH}/libQt5QuickParticles.so",
+                        "lib/${ARCH}/libQt5Quick.so",
+                        "lib/${ARCH}/libqmlapp.so",
+                        "res/layout/splash.xml"});
+        qmlAppCustomProperties = QStringList{"modules.Android.sdk.automaticSources:false",
+                            "modules.qbs.architecture:" + archsForQt.first()};
+    } else {
+        qmlAppExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
                        "resources.arsc",
-                       "assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list",
+                       "assets/android_rcc_bundle.rcc",
                        "lib/${ARCH}/libgdbserver.so",
                        cxxLibPath("libgnustl_shared.so", true),
-                       "lib/${ARCH}/libqmlapp.so",
-                       "res/layout/splash.xml"}))
+                       "lib/${ARCH}/libplugins_bearer_qandroidbearer_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qgif_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qicns_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qico_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qjpeg_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qtga_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qtiff_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qwbmp_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_imageformats_qwebp_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_platforms_qtforandroid_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_debugger_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_inspector_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_local_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_messages_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_native_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_nativedebugger_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_profiler_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_preview_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_quickprofiler_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_server_${ARCH}.so",
+                       "lib/${ARCH}/libplugins_qmltooling_qmldbg_tcp_${ARCH}.so",
+                       "lib/${ARCH}/libqml_QtQuick.2_qtquick2plugin_${ARCH}.so",
+                       "lib/${ARCH}/libqml_QtQuick_Window.2_windowplugin_${ARCH}.so",
+                       "lib/${ARCH}/libQt5Core_${ARCH}.so",
+                       "lib/${ARCH}/libQt5Gui_${ARCH}.so",
+                       "lib/${ARCH}/libQt5Network_${ARCH}.so",
+                       "lib/${ARCH}/libQt5Qml_${ARCH}.so",
+                       "lib/${ARCH}/libQt5QuickParticles_${ARCH}.so",
+                       "lib/${ARCH}/libQt5Quick_${ARCH}.so",
+                       "lib/${ARCH}/libQt5QmlModels_${ARCH}.so",
+                       "lib/${ARCH}/libQt5QmlWorkerScript_${ARCH}.so",
+                       "lib/${ARCH}/libqmlapp_${ARCH}.so",
+                       "res/layout/splash.xml"});
+        qmlAppMinistroExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
+                        "resources.arsc",
+                        "assets/android_rcc_bundle.rcc",
+                        "lib/${ARCH}/libgdbserver.so",
+                        cxxLibPath("libgnustl_shared.so", true),
+                        "lib/${ARCH}/libqmlapp_${ARCH}.so",
+                        "res/layout/splash.xml"});
+        qmlAppCustomMetaDataExpectedFiles << commonFiles + expandArchs(ndkArchsForQt, {
+                        "resources.arsc",
+                        "assets/android_rcc_bundle.rcc",
+                        "assets/dummyasset.txt",
+                        "lib/${ARCH}/libgdbserver.so",
+                        cxxLibPath("libgnustl_shared.so", true),
+                        "lib/${ARCH}/libplugins_bearer_qandroidbearer_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qgif_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qicns_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qico_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qjpeg_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qtga_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qtiff_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qwbmp_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_imageformats_qwebp_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_platforms_qtforandroid_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_debugger_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_inspector_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_local_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_messages_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_native_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_nativedebugger_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_profiler_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_preview_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_quickprofiler_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_server_${ARCH}.so",
+                        "lib/${ARCH}/libplugins_qmltooling_qmldbg_tcp_${ARCH}.so",
+                        "lib/${ARCH}/libqml_QtQuick.2_qtquick2plugin_${ARCH}.so",
+                        "lib/${ARCH}/libqml_QtQuick_Window.2_windowplugin_${ARCH}.so",
+                        "lib/${ARCH}/libQt5Core_${ARCH}.so",
+                        "lib/${ARCH}/libQt5Gui_${ARCH}.so",
+                        "lib/${ARCH}/libQt5Network_${ARCH}.so",
+                        "lib/${ARCH}/libQt5Qml_${ARCH}.so",
+                        "lib/${ARCH}/libQt5QuickParticles_${ARCH}.so",
+                        "lib/${ARCH}/libQt5Quick_${ARCH}.so",
+                        "lib/${ARCH}/libQt5QmlModels_${ARCH}.so",
+                        "lib/${ARCH}/libQt5QmlWorkerScript_${ARCH}.so",
+                        "lib/${ARCH}/libqmlapp_${ARCH}.so",
+                        "res/layout/splash.xml"});
+        qmlAppCustomProperties = QStringList{"modules.Android.sdk.automaticSources:false"};
+    }
+    QTest::newRow("qml app")
+            << "qml-app" << QStringList("qmlapp")
+            << (QList<QByteArrayList>() << qmlAppExpectedFiles)
+            << qmlAppCustomProperties;
+    QTest::newRow("qml app using Ministro")
+            << "qml-app" << QStringList("qmlapp")
+            << (QList<QByteArrayList>() << qmlAppMinistroExpectedFiles)
             << QStringList{"modules.Qt.android_support.useMinistro:true",
                            "modules.Android.sdk.automaticSources:false"};
     QTest::newRow("qml app with custom metadata")
             << "qml-app" << QStringList("qmlapp")
-            << (QList<QByteArrayList>() << commonFiles + expandArchs(ndkArchsForQt, {
-                       "resources.arsc",
-                       "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/plugins.qmltypes",
-                       "assets/--Added-by-androiddeployqt--/qml/QtQuick.2/qmldir",
-                       "assets/--Added-by-androiddeployqt--/qml/QtQuick/Window.2/plugins.qmltypes",
-                       "assets/--Added-by-androiddeployqt--/qml/QtQuick/Window.2/qmldir",
-                       "assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list",
-                       "assets/dummyasset.txt",
-                       "lib/${ARCH}/libgdbserver.so",
-                       cxxLibPath("libgnustl_shared.so", true),
-                       "lib/${ARCH}/libplugins_bearer_libqandroidbearer.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqgif.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqicns.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqico.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqjpeg.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqtga.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqtiff.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqwbmp.so",
-                       "lib/${ARCH}/libplugins_imageformats_libqwebp.so",
-                       "lib/${ARCH}/libplugins_platforms_android_libqtforandroid.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_debugger.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_inspector.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_local.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_messages.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_native.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_nativedebugger.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_profiler.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_preview.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_quickprofiler.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_server.so",
-                       "lib/${ARCH}/libplugins_qmltooling_libqmldbg_tcp.so",
-                       "lib/${ARCH}/libqml_QtQuick.2_libqtquick2plugin.so",
-                       "lib/${ARCH}/libqml_QtQuick_Window.2_libwindowplugin.so",
-                       "lib/${ARCH}/libQt5Core.so",
-                       "lib/${ARCH}/libQt5Gui.so",
-                       "lib/${ARCH}/libQt5Network.so",
-                       "lib/${ARCH}/libQt5Qml.so",
-                       "lib/${ARCH}/libQt5QuickParticles.so",
-                       "lib/${ARCH}/libQt5Quick.so",
-                       "lib/${ARCH}/libqmlapp.so",
-                       "res/layout/splash.xml"}))
-                << QStringList("modules.Android.sdk.automaticSources:true");
+            << (QList<QByteArrayList>() << qmlAppCustomMetaDataExpectedFiles)
+            << QStringList("modules.Android.sdk.automaticSources:true");
     QTest::newRow("no native")
             << "no-native"
             << QStringList("com.example.android.basicmediadecoder")
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp
index 61b0271f6..4550edcac 100644
--- a/tests/auto/blackbox/tst_blackboxbase.cpp
+++ b/tests/auto/blackbox/tst_blackboxbase.cpp
@@ -232,3 +232,21 @@ QMap<QString, QString> TestBlackboxBase::findJdkTools(int *status)
         {"jar", QDir::fromNativeSeparators(tools["jar"].toString())}
     };
 }
+
+qbs::Version TestBlackboxBase::qmakeVersion(const QString &qmakeFilePath)
+{
+    QStringList arguments;
+    arguments << "-query" << "QT_VERSION";
+    QProcess qmakeProcess;
+    qmakeProcess.start(qmakeFilePath, arguments);
+    if (!qmakeProcess.waitForStarted() || !qmakeProcess.waitForFinished()
+        || qmakeProcess.exitStatus() != QProcess::NormalExit) {
+        qDebug() << "qmake '" << qmakeFilePath << "' could not be run.";
+        return qbs::Version();
+    }
+    QByteArray result = qmakeProcess.readAll().simplified();
+    qbs::Version version = qbs::Version::fromString(result);
+    if (!version.isValid())
+        qDebug() << "qmake '" << qmakeFilePath << "' version is not valid.";
+    return version;
+}
diff --git a/tests/auto/blackbox/tst_blackboxbase.h b/tests/auto/blackbox/tst_blackboxbase.h
index c1c4d39b2..518cc80d0 100644
--- a/tests/auto/blackbox/tst_blackboxbase.h
+++ b/tests/auto/blackbox/tst_blackboxbase.h
@@ -92,6 +92,7 @@ protected:
     static void ccp(const QString &sourceDirPath, const QString &targetDirPath);
     static QString findExecutable(const QStringList &fileNames);
     QMap<QString, QString> findJdkTools(int *status);
+    static qbs::Version qmakeVersion(const QString &qmakeFilePath);
 
     const QString testDataDir;
     const QString testSourceDir;