AndroidApk: don't error out if no AndroidManifest.xml file exists

If the AndroidManifest.xml files does not exist at the *default* file
path, simply don't add it to the project. Only if the user explicitly
specifies an AndroidManifest.xml do we error out now.

This prepares for adding Manifest Merger support, which allows projects
to omit an Android manifest file entirely, in which case Qbs will
synthesize one from various properties.

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

1 files changed, 9 insertions, 2 deletions

diff --git a/share/qbs/imports/qbs/base/AndroidApk.qbs b/share/qbs/imports/qbs/base/AndroidApk.qbs
index c6f3ce7de..8ba7ff049 100644
--- a/share/qbs/imports/qbs/base/AndroidApk.qbs
+++ b/share/qbs/imports/qbs/base/AndroidApk.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 import qbs
+import qbs.File
 import qbs.FileInfo
 
 Product {
@@ -44,7 +45,10 @@ Product {
     property path resourcesDir: FileInfo.joinPaths(sourceSetDir, "res")
     property path assetsDir: FileInfo.joinPaths(sourceSetDir, "assets")
     property path sourcesDir: FileInfo.joinPaths(sourceSetDir, legacyLayout ? "src" : "java")
-    property path manifestFile: FileInfo.joinPaths(sourceSetDir, "AndroidManifest.xml")
+    property path manifestFile: defaultManifestFile
+
+    readonly property path defaultManifestFile: FileInfo.joinPaths(sourceSetDir,
+                                                                   "AndroidManifest.xml")
 
     Group {
         name: "java sources"
@@ -72,6 +76,9 @@ Product {
     Group {
         name: "manifest"
         condition: product.automaticSources
-        files: [manifestFile]
+        fileTags: ["android.manifest"]
+        files: manifestFile && manifestFile !== defaultManifestFile
+               ? [manifestFile]
+               : (File.exists(defaultManifestFile) ? [defaultManifestFile] : [])
     }
 }