1 files changed, 9 insertions, 60 deletions

diff --git a/share/qbs/modules/Android/sdk/utils.js b/share/qbs/modules/Android/sdk/utils.js
index 63bf1f5c4..264ad2da7 100644
--- a/share/qbs/modules/Android/sdk/utils.js
+++ b/share/qbs/modules/Android/sdk/utils.js
@@ -30,9 +30,11 @@
 
 var File = require("qbs.File");
 var FileInfo = require("qbs.FileInfo");
+var ModUtils = require("qbs.ModUtils");
 var Process = require("qbs.Process");
 var TextFile = require("qbs.TextFile");
 var Utilities = require("qbs.Utilities");
+var Xml = require("qbs.Xml");
 
 function availableBuildToolsVersions(sdkDir) {
     var re = /^([0-9]+)\.([0-9]+)\.([0-9]+)$/;
@@ -172,7 +174,8 @@ function prepareAapt2CompileResource(project, product, inputs, outputs, input, o
         throw "Cannot create directory '" + FileInfo.toNativeSeparators(compilesResourcesDir) +
               "'.";
     }
-    var args = ["compile", input.filePath, "-o", compilesResourcesDir];
+    var args = ["compile", FileInfo.toNativeSeparators(input.filePath),
+                "-o", FileInfo.toNativeSeparators(compilesResourcesDir)];
     var cmd = new Command(product.Android.sdk.aaptFilePath, args);
     var outputFileName = generateAapt2ResourceFileName(input.filePath);
     cmd.description = "compiling resource " + input.fileName + " into " + outputFileName;
@@ -240,7 +243,7 @@ function prepareAaptGenerate(project, product, inputs, outputs, input, output,
 
 function prepareAaptPackage(project, product, inputs, outputs, input, output, explicitlyDependsOn) {
     var cmds = [];
-    var apkOutput = outputs["android.package"][0];
+    var apkOutput = outputs["android.package_unsigned"][0];
     var args = commonAaptPackageArgs.apply(this, arguments);
     args.push("-F", apkOutput.filePath + ".unaligned");
     args.push(product.Android.sdk.packageContentsDir);
@@ -248,17 +251,6 @@ function prepareAaptPackage(project, product, inputs, outputs, input, output, ex
     cmd.description = "generating " + apkOutput.fileName;
     cmds.push(cmd);
 
-    if (!product.Android.sdk.useApksigner) {
-        args = ["-sigalg", "SHA1withRSA", "-digestalg", "SHA1",
-                "-keystore", inputs["android.keystore"][0].filePath,
-                "-storepass", "android",
-                apkOutput.filePath + ".unaligned",
-                "androiddebugkey"];
-        cmd = new Command(product.java.jarsignerFilePath, args);
-        cmd.description = "signing " + apkOutput.fileName;
-        cmds.push(cmd);
-    }
-
     cmd = new Command(product.Android.sdk.zipalignFilePath,
                       ["-f", "4", apkOutput.filePath + ".unaligned", apkOutput.filePath]);
     cmd.silent = true;
@@ -269,26 +261,14 @@ function prepareAaptPackage(project, product, inputs, outputs, input, output, ex
     cmd.unalignedApk = apkOutput.filePath + ".unaligned";
     cmd.sourceCode = function() { File.remove(unalignedApk); };
     cmds.push(cmd);
-
-    if (product.Android.sdk.useApksigner) {
-        // TODO: Implement full signing support, not just using the debug keystore
-        args = ["sign",
-                "--ks", inputs["android.keystore"][0].filePath,
-                "--ks-pass", "pass:android",
-                apkOutput.filePath];
-        cmd = new Command(product.Android.sdk.apksignerFilePath, args);
-        cmd.description = "signing " + apkOutput.fileName;
-        cmds.push(cmd);
-    }
-
     return cmds;
 }
 
 function prepareApkPackage(project, product, inputs, outputs, input, output, explicitlyDependsOn) {
     var cmds = [];
     var apkInputFilePath = inputs["android.apk_resources"][0].filePath;
-    var apkOutput = outputs["android.package"][0];
-    var apkOutputFilePathUnaligned = outputs["android.package"][0].filePath + ".unaligned";
+    var apkOutput = outputs["android.package_unsigned"][0];
+    var apkOutputFilePathUnaligned = apkOutput.filePath + ".unaligned";
     var dexFilePath = inputs["android.dex"][0].filePath;
 
     var copyCmd = new JavaScriptCommand();
@@ -307,17 +287,6 @@ function prepareApkPackage(project, product, inputs, outputs, input, output, exp
     jarCmd.workingDirectory = libPath;
     cmds.push(jarCmd);
 
-    if (!product.Android.sdk.useApksigner) {
-        args = ["-sigalg", "SHA1withRSA", "-digestalg", "SHA1",
-                "-keystore", inputs["android.keystore"][0].filePath,
-                "-storepass", "android",
-                apkOutputFilePathUnaligned,
-                "androiddebugkey"];
-        cmd = new Command(product.java.jarsignerFilePath, args);
-        cmd.description = "signing " + apkOutput.fileName;
-        cmds.push(cmd);
-    }
-
     cmd = new Command(product.Android.sdk.zipalignFilePath,
                       ["-f", "4", apkOutputFilePathUnaligned, apkOutput.filePath]);
     cmd.silent = true;
@@ -328,18 +297,6 @@ function prepareApkPackage(project, product, inputs, outputs, input, output, exp
     cmd.unalignedApk = apkOutputFilePathUnaligned;
     cmd.sourceCode = function() { File.remove(unalignedApk); };
     cmds.push(cmd);
-
-    if (product.Android.sdk.useApksigner) {
-        // TODO: Implement full signing support, not just using the debug keystore
-        args = ["sign",
-                "--ks", inputs["android.keystore"][0].filePath,
-                "--ks-pass", "pass:android",
-                apkOutput.filePath];
-        cmd = new Command(product.Android.sdk.apksignerFilePath, args);
-        cmd.description = "signing " + apkOutput.fileName;
-        cmds.push(cmd);
-    }
-
     return cmds;
 }
 
@@ -375,7 +332,7 @@ function prepareBundletoolPackage(project, product, inputs, outputs, input, outp
     jarBaseCmd.workingDirectory = baseModuleDir;
     cmds.push(jarBaseCmd);
 
-    var aabFilePath = outputs["android.package"][0].filePath;
+    var aabFilePath = outputs["android.package_unsigned"][0].filePath;
     var removeCmd = new JavaScriptCommand();
     removeCmd.description = "removing previous aab";
     removeCmd.filePath = aabFilePath;
@@ -389,20 +346,12 @@ function prepareBundletoolPackage(project, product, inputs, outputs, input, outp
     args.push("--modules=" + baseFilePath);
     args.push("--output=" + aabFilePath);
     var cmd = new Command(product.java.interpreterFilePath, args);
-    cmd.description = "generating " + outputs["android.package"][0].fileName;
+    cmd.description = "generating " + aabFilePath.fileName;
     cmds.push(cmd);
 
     return cmds;
 }
 
-function createDebugKeyStoreCommandString(keytoolFilePath, keystoreFilePath) {
-    var args = ["-genkey", "-keystore", keystoreFilePath, "-alias", "androiddebugkey",
-                "-storepass", "android", "-keypass", "android", "-keyalg", "RSA",
-                "-keysize", "2048", "-validity", "10000", "-dname",
-                "CN=Android Debug,O=Android,C=US"];
-    return Process.shellQuote(keytoolFilePath, args);
-}
-
 function stlDeploymentData(product, inputs, type)
 {
     var data = { uniqueInputs: [], outputFilePaths: []};