aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorAlberto Mardegan <mardy@users.sourceforge.net>2019-12-29 15:50:17 +0300
committerAlberto Mardegan <mardy@users.sourceforge.net>2020-01-02 10:48:37 +0000
commit8b31c32f7640ef06a12ad6995e202e5087e19b4a (patch)
tree95db030bf768868993bbff806eabb9302cdbf0ec /share
parente4f569ca0420ef3e945e5ac5f79fd996959e4120 (diff)
Android: allow reading resources from local folder
When adding a `src/main/res` folder, the `aapt` command starts failing with a bunch of errors like this: <project-path>/default/lingualonga.38c8076f/deployqt_out/res/values-in/strings.xml:3: error: Resource at ministro_not_found_msg appears in overlay but not in the base package; use <add-resource> to add. According to some online source ([1]), this is due to the presence of multiple `-S` options to specify resource paths, and can be fixed by adding the `--auto-add-overlay` option. [1]: https://stackoverflow.com/questions/11569393/how-can-i-use-multiple-s-values-with-aapt-without-using-add-resource Change-Id: Ib1c5741e0194ac1866eb081e0461ac37c80f315c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/Android/sdk/utils.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/utils.js b/share/qbs/modules/Android/sdk/utils.js
index 3af179df2..90c8bc1bf 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"];