reland "make bots call android_ninja instead of android_make"

slave/skia_slave_scripts/build_step.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Base class for all slave-side build steps. """
 
 import config
 # pylint: disable=W0611
 import flavor_utils
 import imp
@@ skipping 173 matching lines @@
     self._autogen_svn_password_file = '.autogen_svn_password'
     self._make_flags = shlex.split(args['make_flags'].replace('"', ''))
     self._test_args = shlex.split(args['test_args'].replace('"', ''))
     self._gm_args = shlex.split(args['gm_args'].replace('"', ''))
     self._gm_args.append('--serialize')
     self._bench_args = shlex.split(args['bench_args'].replace('"', ''))
     self._is_try = args['is_try'] == 'True'
 
     if os.name == 'nt':
       self._default_make_flags = []
+      self._default_ninja_flags = []
     else:
       # Set the jobs limit to 4, since we have multiple slaves running on each
       # machine.
       self._default_make_flags = ['--jobs', '4', '--max-load=4.0']
+      self._default_ninja_flags = ['-j', '4', '-l', '4.0']
 
     # Adding the playback directory transfer objects.
     self._local_playback_dirs = LocalSkpPlaybackDirs(
         self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
     self._storage_playback_dirs = StorageSkpPlaybackDirs(
         self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
@@ skipping 29 matching lines @@
     return self._configuration
 
   @property
   def builder_name(self):
     return self._builder_name
 
   @property
   def args(self):
     return self._args
 
+  # TODO(epoger): remove default_make_flags property once all builds use ninja
   @property
   def default_make_flags(self):
     return self._default_make_flags
 
   @property
+  def default_ninja_flags(self):
+    return self._default_ninja_flags
+
+  @property
   def make_flags(self):
     return self._make_flags
 
   @property
   def perf_data_dir(self):
     return self._perf_data_dir
 
   @property
   def resource_dir(self):
     return self._resource_dir
@@ skipping 117 matching lines @@
         else:
           raise BuildStepFailure('Build step failed.')
       except Exception:
         print traceback.format_exc()
         if attempt + 1 >= step.attempts:
           raise
       # pylint: disable=W0212
       step._WaitFunc(attempt)
       attempt += 1
       print '**** %s, attempt %d ****' % (StepType.__name__, attempt + 1)