1 files changed, 8 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/utils.js b/share/qbs/modules/Android/sdk/utils.js
index 3af179df2..6d3837d57 100644
--- a/share/qbs/modules/Android/sdk/utils.js
+++ b/share/qbs/modules/Android/sdk/utils.js
@@ -98,7 +98,7 @@ function findParentDir(filePath, parentDirName)
 function commonAaptPackageArgs(project, product, inputs, outputs, input, output,
                                explicitlyDependsOn) {
     var manifestFilePath = inputs["android.manifest_final"][0].filePath;
-    var args = ["package", "-f",
+    var args = ["package", "--auto-add-overlay", "-f",
                 "-M", manifestFilePath,
                 "-I", product.Android.sdk.androidJarFilePath];
     var resources = inputs["android.resources"];
@@ -222,3 +222,10 @@ function gdbserverOrStlDeploymentData(product, inputs, type)
     }
     return data;
 }
+
+function elementHasBundledAttributes(element)
+{
+    return element.hasAttribute("android:name") &&
+            (element.attribute("android:name") === "android.app.bundled_in_assets_resource_id") ||
+            (element.attribute("android:name") === "android.app.bundled_in_lib_resource_id");
+}