From 6bba56d4104cad4ffd9175193a6dfc05a0de55d2 Mon Sep 17 00:00:00 2001 From: Raphael Cotty Date: Thu, 1 Apr 2021 21:07:52 +0200 Subject: 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 --- share/qbs/modules/Android/sdk/sdk.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"] -- cgit v1.2.3