public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-8204: Reinstate link tasks to avoid gradle build failures

Browse Source
This commit is contained in:
Ian Clelland 2014-12-22 13:24:08 -05:00
parent 6b6e887c2f
commit 98fe46757f
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,25 +175,6 @@ var builders = {
}, },
gradle: { gradle: {
getArgs: function(cmd, arch) { getArgs: function(cmd, arch) {
var lintSteps;
if (process.env['BUILD_MULTIPLE_APKS']) {
lintSteps = [
'lint',
'lintVitalX86Release',
'lintVitalArmv7Release',
'compileLint',
'copyReleaseLint',
'copyDebugLint'
];
} else {
lintSteps = [
'lint',
'lintVitalRelease',
'compileLint',
'copyReleaseLint',
'copyDebugLint'
];
}
if (arch == 'arm' && cmd == 'debug') { if (arch == 'arm' && cmd == 'debug') {
cmd = 'assembleArmv7Debug'; cmd = 'assembleArmv7Debug';
} else if (arch == 'arm' && cmd == 'release') { } else if (arch == 'arm' && cmd == 'release') {
@ -210,10 +191,6 @@ var builders = {
var args = [cmd, '-b', path.join(ROOT, 'build.gradle')]; var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
// 10 seconds -> 6 seconds // 10 seconds -> 6 seconds
args.push('-Dorg.gradle.daemon=true'); args.push('-Dorg.gradle.daemon=true');
// Excluding lint: 6s-> 1.6s
for (var i = 0; i < lintSteps.length; ++i) {
args.push('-x', lintSteps[i]);
}
// Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet): // Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet):
// args.push('-Dorg.gradle.parallel=true'); // args.push('-Dorg.gradle.parallel=true');
return args; return args;