You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/12/22 19:30:19 UTC

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

Repository: cordova-android
Updated Branches:
  refs/heads/master 6b6e887c2 -> 98fe46757


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


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/98fe4675
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/98fe4675
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/98fe4675

Branch: refs/heads/master
Commit: 98fe46757f0acee933142046509f2392a6381eeb
Parents: 6b6e887
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Dec 22 13:24:08 2014 -0500
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Dec 22 13:24:58 2014 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 23 -----------------------
 1 file changed, 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/98fe4675/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 4223570..86b5e66 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -175,25 +175,6 @@ var builders = {
     },
     gradle: {
         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') {
                 cmd = 'assembleArmv7Debug';
             } else if (arch == 'arm' && cmd == 'release') {
@@ -210,10 +191,6 @@ var builders = {
             var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
             // 10 seconds -> 6 seconds
             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):
             // args.push('-Dorg.gradle.parallel=true');
             return args;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org