diff options
Diffstat (limited to 'share/qbs/modules/Android/sdk/sdk.qbs')
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index cae5fc2e5..b284c1f8f 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"] @@ -167,6 +167,13 @@ Module { property path apksignerFilePath: FileInfo.joinPaths(buildToolsDir, "apksigner") property path aidlFilePath: FileInfo.joinPaths(buildToolsDir, "aidl") property path dxFilePath: FileInfo.joinPaths(buildToolsDir, "dx") + property path d8FilePath: FileInfo.joinPaths(buildToolsDir, "d8") + property string dexCompilerName: "d8" + PropertyOptions { + name: "dexCompilerName" + allowedValues: ["dx", "d8"] + } + readonly property bool _useD8: dexCompilerName === "d8" property path zipalignFilePath: FileInfo.joinPaths(buildToolsDir, "zipalign") property path androidJarFilePath: FileInfo.joinPaths(sdkDir, "platforms", platform, "android.jar") @@ -430,7 +437,7 @@ Module { condition: _enableRules multiplex: true inputs: ["java.class"] - inputsFromDependencies: ["java.jar"] + inputsFromDependencies: ["java.jar", "bundled_jar"] Artifact { filePath: product.Android.sdk._generateAab ? FileInfo.joinPaths(product.Android.sdk.packageContentsDir, "dex", |