github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 15:12:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (unaligned apk fix)

Browse Source
This commit is contained in:
Andrew Grieve 2014-09-16 15:00:54 -04:00
commit 6fb164d200
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/templates/cordova/lib/build.js vendored
View File

@ -38,8 +38,11 @@ function find_files(directory, predicate) {
p = path.join(directory, p);
return { p: p, t: fs.statSync(p).mtime };
}).sort(function(a,b) {
return a.t > b.t ? -1 :
a.t < b.t ? 1 : 0;
var timeDiff = b.t - a.t;
if (timeDiff === 0) {
return a.p.length - b.p.length;
}
return timeDiff;
}).map(function(p) { return p.p; });
return candidates;
} else {
@ -151,8 +154,9 @@ var builders = {
console.error('ERROR : No .apk found in ' + binDir + ' directory');
process.exit(2);
}
console.log('Using apk: ' + candidates[0]);
return [candidates[0]];
var ret = candidates[0];
console.log('Using apk: ' + ret);
return [ret];
}
},
gradle: {
@ -245,14 +249,16 @@ var builders = {
var candidates = find_files(binDir, function(candidate) {
// Need to choose between release and debug .apk.
if (build_type === 'debug') {
return (path.extname(candidate) == '.apk' && candidate.indexOf('-debug-') >= 0);
return (path.extname(candidate) == '.apk' && candidate.indexOf('-debug') >= 0);
}
if (build_type === 'release') {
return (path.extname(candidate) == '.apk' && candidate.indexOf('-release-') >= 0);
return (path.extname(candidate) == '.apk' && candidate.indexOf('-release') >= 0);
}
return path.extname(candidate) == '.apk';
});
return candidates;
var ret = candidates[0];
console.log('Using apk: ' + ret);
return [ret];
}
},