aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Cotty <raphael.cotty@gmail.com>2021-04-01 21:07:52 +0200
committerRaphaƫl Cotty <raphael.cotty@gmail.com>2021-04-06 13:14:01 +0000
commit6bba56d4104cad4ffd9175193a6dfc05a0de55d2 (patch)
tree697b562d06f3a602cfaf1a09f0be4ae99b171c5f
parentb24b2dd28c09902a01cfb6e5c2fc3be5a1f8deec (diff)
Android: Change default Android Asset Packaging Tool from aapt to aapt2
aapt2 was introduced in Build Tools since 26.0.2 and replaced aapt in gradle since version 3.0.0. Since Android.sdk now requires Build Tool version 24.0.3 it is possible to default to aapt2. Change-Id: Ia6ec88267ca58413592d6eadde73422311f34d74 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--share/qbs/modules/Android/sdk/sdk.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs
index cae5fc2e5..76f84dca6 100644
--- a/share/qbs/modules/Android/sdk/sdk.qbs
+++ b/share/qbs/modules/Android/sdk/sdk.qbs
@@ -150,7 +150,7 @@ Module {
}
property path buildToolsDir: FileInfo.joinPaths(sdkDir, "build-tools", buildToolsVersion)
- property string aaptName: "aapt"
+ property string aaptName: "aapt2"
PropertyOptions {
name: "aaptName"
allowedValues: ["aapt", "aapt2"]