Properly support building Qt apps for Android

... via the androiddeployqt tool.

Fixes: QBS-991
Change-Id: I4a3abe977fee6a9d1657a4fd6c1b43709429da9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

7 files changed, 264 insertions, 12 deletions

diff --git a/tests/auto/blackbox/testdata-android/qml-app/main.cpp b/tests/auto/blackbox/testdata-android/qml-app/main.cpp
new file mode 100644
index 000000000..e7cf5e16e
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/main.cpp
@@ -0,0 +1,21 @@
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) {
+        qputenv("QT_QPA_EGLFS_PHYSICAL_WIDTH", QByteArray("213"));
+        qputenv("QT_QPA_EGLFS_PHYSICAL_HEIGHT", QByteArray("120"));
+
+        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    }
+
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}
diff --git a/tests/auto/blackbox/testdata-android/qml-app/main.qml b/tests/auto/blackbox/testdata-android/qml-app/main.qml
new file mode 100644
index 000000000..45ee20a2f
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/main.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.6
+import QtQuick.Window 2.2
+
+Window {
+    visible: true
+    width: 640
+    height: 480
+    title: qsTr("Hello World")
+}
diff --git a/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
new file mode 100644
index 000000000..56b9d6eaf
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/qml-app.qbs
@@ -0,0 +1,14 @@
+QtApplication {
+    name: "qmlapp"
+    Depends { name: "Qt.quick" }
+    Depends { name: "Qt.android_support" }
+    Properties {
+        condition: qbs.targetOS.contains("android")
+        Qt.android_support.extraPrefixDirs: path
+    }
+    property stringList qmlImportPaths: path
+    files: [
+        "main.cpp",
+        "qml.qrc",
+    ]
+}
diff --git a/tests/auto/blackbox/testdata-android/qml-app/qml.qrc b/tests/auto/blackbox/testdata-android/qml-app/qml.qrc
new file mode 100644
index 000000000..5f6483ac3
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/blackbox/testdata-android/qml-app/src/main/AndroidManifest.xml b/tests/auto/blackbox/testdata-android/qml-app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..066ec0a63
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/src/main/AndroidManifest.xml
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
+                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
+                  android:label="-- %%INSERT_APP_NAME%% --"
+                  android:screenOrientation="unspecified"
+                  android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <!-- Application arguments -->
+            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+            <!-- Application arguments -->
+
+            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <!--  Messages maps -->
+
+            <!-- Splash screen -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+            <!-- Splash screen -->
+
+            <!-- Background running -->
+            <!-- Warning: changing this value to true may cause unexpected crashes if the
+                          application still try to draw after
+                          "applicationStateChanged(Qt::ApplicationSuspended)"
+                          signal is sent! -->
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <!-- Background running -->
+
+            <!-- auto screen scale factor -->
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <!-- auto screen scale factor -->
+
+            <!-- extract android style -->
+            <!-- available android:values :
+                * full - useful QWidget & Quick Controls 1 apps
+                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+                * none - useful for apps that don't use any of the above Qt modules
+                -->
+            <meta-data android:name="android.app.extract_android_style" android:value="full"/>
+            <!-- extract android style -->
+    </activity>
+
+    <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+
+    </application>
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
+    <!-- %%INSERT_PERMISSIONS -->
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+    <!-- %%INSERT_FEATURES -->
+
+</manifest>
diff --git a/tests/auto/blackbox/testdata-android/qml-app/src/main/assets/dummyasset.txt b/tests/auto/blackbox/testdata-android/qml-app/src/main/assets/dummyasset.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/auto/blackbox/testdata-android/qml-app/src/main/assets/dummyasset.txt
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index 5630bdcb5..bea4ee595 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -69,6 +69,11 @@ TestBlackboxAndroid::TestBlackboxAndroid()
 {
 }
 
+static QString theProfileName(bool forQt)
+{
+    return forQt ? "qbs_autotests-android-qt" : profileName();
+}
+
 void TestBlackboxAndroid::android()
 {
     QFETCH(QString, projectDir);
@@ -77,7 +82,7 @@ void TestBlackboxAndroid::android()
     QFETCH(QStringList, customProperties);
 
     const SettingsPtr s = settings();
-    Profile p(profileName(), s.get());
+    Profile p(theProfileName(projectDir == "qml-app"), s.get());
     int status;
     const auto androidPaths = findAndroid(&status, p.name());
     QCOMPARE(status, 0);
@@ -112,7 +117,10 @@ void TestBlackboxAndroid::android()
         buildParams.profile = p.name();
         QCOMPARE(runQbs(buildParams), 0);
         for (const QString &productName : qAsConst(productNames)) {
-            QCOMPARE(m_qbsStdout.count("Generating BuildConfig.java"), productNames.size());
+            const QByteArray tag(QTest::currentDataTag());
+            const bool isIncrementalBuild = tag.startsWith("qml app") && tag != "qml app";
+            QCOMPARE(m_qbsStdout.count("Generating BuildConfig.java"),
+                     isIncrementalBuild ? 0 : productNames.size());
             QVERIFY(m_qbsStdout.contains(productName.toLocal8Bit() + ".apk"));
             const QString apkFilePath = relativeProductBuildDir(productName, configName)
                     + '/' + productName + ".apk";
@@ -146,10 +154,15 @@ void TestBlackboxAndroid::android()
                 auto isFileSharedObject = [](const QByteArray &f) {
                     return f.endsWith(".so");
                 };
-                if (none_of(actualFiles, isFileSharedObject))
+                const auto isQmlToolingLib = [](const QByteArray &f) {
+                    return f.contains("qmltooling");
+                };
+                if (none_of(actualFiles, isFileSharedObject)
+                        || std::all_of(actualFiles.cbegin(), actualFiles.cend(), isQmlToolingLib)) {
                     QWARN(msg);
-                else
+                } else {
                     QFAIL(msg);
+                }
             }
         }
 
@@ -176,6 +189,7 @@ void TestBlackboxAndroid::android_data()
 {
     const SettingsPtr s = settings();
     const Profile p(profileName(), s.get());
+    const Profile pQt(theProfileName(true), s.get());
     QStringList archsStringList = p.value(QLatin1String("qbs.architectures")).toStringList();
     if (archsStringList.empty())
         archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs
@@ -186,10 +200,19 @@ void TestBlackboxAndroid::android_data()
                 .replace("armv5te", "armeabi")
                 .replace("arm64", "arm64-v8a");
     });
-    const bool usesClang = p.value(QLatin1String("qbs.toolchainType")).toString() == "clang";
-    const auto cxxLibPath = [usesClang](const QByteArray &oldcxxLib) {
+    const auto cxxLibPath = [&p, &pQt](const QByteArray &oldcxxLib, bool forQt) {
+        const bool usesClang = (forQt ? pQt : p).value(QLatin1String("qbs.toolchainType"))
+                .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";
 
     auto expandArchs = [] (const QByteArrayList &archs, const QByteArrayList &lst) {
         const QByteArray &archPlaceHolder = "${ARCH}";
@@ -221,7 +244,7 @@ void TestBlackboxAndroid::android_data()
                        "assets/Shaders/ShaderPlain.fsh",
                        "assets/Shaders/VS_ShaderPlain.vsh",
                        "lib/${ARCH}/libgdbserver.so",
-                       cxxLibPath("libgnustl_shared.so"),
+                       cxxLibPath("libgnustl_shared.so", false),
                        "lib/${ARCH}/libTeapotNativeActivity.so",
                        "res/layout/widgets.xml"}))
             << QStringList();
@@ -229,10 +252,109 @@ void TestBlackboxAndroid::android_data()
             << "minimal-native" << QStringList("minimalnative")
             << (QList<QByteArrayList>() << commonFiles + expandArchs({archs.first()}, {
                        "lib/${ARCH}/libminimalnative.so",
-                       cxxLibPath("libstlport_shared.so"),
+                       cxxLibPath("libstlport_shared.so", false),
                        "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, {
+                       "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",
+                       "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:false",
+                               "modules.qbs.architecture:" + archsForQt.first()};
+    QTest::newRow("qml app using Ministro")
+            << "qml-app" << QStringList("qmlapp")
+            << (QList<QByteArrayList>() << 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"}))
+            << 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");
     QTest::newRow("no native")
             << "no-native"
             << QStringList("com.example.android.basicmediadecoder")
@@ -265,24 +387,24 @@ void TestBlackboxAndroid::android_data()
                        "lib/${ARCH}/libgdbserver.so",
                        "lib/${ARCH}/liblib1.so",
                        "lib/${ARCH}/liblib2.so",
-                       cxxLibPath("libstlport_shared.so")}))
+                       cxxLibPath("libstlport_shared.so", false)}))
             << QStringList();
     QByteArrayList expectedFiles1 = (commonFiles
             + expandArchs(QByteArrayList{"armeabi-v7a", "x86"}, {
                               "resources.arsc",
                               "lib/${ARCH}/libgdbserver.so",
                               "lib/${ARCH}/libp1lib1.so",
-                              cxxLibPath("libstlport_shared.so")})
+                              cxxLibPath("libstlport_shared.so", false)})
             + expandArchs(QByteArrayList{archs}, {
                               "resources.arsc",
                               "lib/${ARCH}/libgdbserver.so",
                               "lib/${ARCH}/libp1lib2.so",
-                              cxxLibPath("libstlport_shared.so")})).toSet().toList();
+                              cxxLibPath("libstlport_shared.so", false)})).toSet().toList();
     QByteArrayList expectedFiles2 = commonFiles + expandArchs(archs, {
                        "lib/${ARCH}/libgdbserver.so",
                        "lib/${ARCH}/libp2lib1.so",
                        "lib/${ARCH}/libp2lib2.so",
-                       cxxLibPath("libstlport_shared.so")});
+                       cxxLibPath("libstlport_shared.so", false)});
     QTest::newRow("multiple apks")
             << "multiple-apks-per-project"
             << (QStringList() << "twolibs1" << "twolibs2")