Repository: cordova-android Updated Branches: refs/heads/4.0.x 6fb164d20 -> 6bdc01290 refs/heads/master a5d300c6f -> ac34bf1e5
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ac34bf1e Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ac34bf1e Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ac34bf1e Branch: refs/heads/4.0.x Commit: ac34bf1e54661bf5397846fc52800810fc1fb302 Parents: a5d300c Author: Andrew Grieve <[email protected]> Authored: Tue Sep 16 15:14:40 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Sep 16 15:14:40 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ac34bf1e/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 3224758..2e6a624 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -155,7 +155,6 @@ var builders = { process.exit(2); } var ret = candidates[0]; - console.log('Using apk: ' + ret); return [ret]; } }, @@ -256,9 +255,7 @@ var builders = { } return path.extname(candidate) == '.apk'; }); - var ret = candidates[0]; - console.log('Using apk: ' + ret); - return [ret]; + return candidates; } }, @@ -343,9 +340,14 @@ module.exports.run = function(options) { // are used by get_apk(). var outputDir = path.join(ROOT, 'out'); shell.mkdir('-p', outputDir); + var builtApks = []; for (var i=0; i < apkFiles.length; ++i) { - shell.cp('-f', apkFiles[i], path.join(outputDir, path.basename(apkFiles[i]))); + var dst = path.join(outputDir, path.basename(apkFiles[i])); + builtApks.push(dst); + shell.cp('-f', apkFiles[i], dst); } + console.log('Built the following APKs:\n' + builtApks.join('\n')); + return builtApks; }); };
