reland "make bots call android_ninja instead of android_make"

slave/skia_slave_scripts/flavor_utils/android_build_step_utils.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.
 
 """ Utilities for Android build steps. """
 
 from default_build_step_utils import DefaultBuildStepUtils, DeviceDirs
 from utils import android_utils
 from utils import gs_utils
 from utils import shell_utils
@@ skipping 99 matching lines @@
       except Exception:
         # If we fail to kill the process, try rebooting the device, and wait for
         # it to come back up.
         shell_utils.run([android_utils.PATH_TO_ADB, '-s', self._serial,
                          'reboot'])
         time.sleep(60)
       android_utils.StopShell(self._serial)
     else:
       android_utils.ADBKill(self._serial, 'com.skia', kill_app=True)
 
+  def RunGYP(self):
+    print 'android_ninja handles gyp'
+    pass
+
   def Compile(self, target):
     """ Compile the Skia executables. """
     os.environ['SKIA_ANDROID_VERBOSE_SETUP'] = '1'
     os.environ['PATH'] = os.path.abspath(
         os.path.join(os.pardir, os.pardir, os.pardir, os.pardir, 'third_party',
                      'gsutil')) + os.pathsep + os.environ['PATH']
     os.environ['BOTO_CONFIG'] = os.path.abspath(os.path.join(
         os.pardir, os.pardir, os.pardir, os.pardir, 'site_config', '.boto'))
     os.environ['ANDROID_SDK_ROOT'] = self._step.args['android_sdk_root']
     os.environ['GYP_DEFINES'] = self._step.args['gyp_defines']
     print 'GYP_DEFINES="%s"' % os.environ['GYP_DEFINES']
-    cmd = [os.path.join('platform_tools', 'android', 'bin', 'android_make'),
+    os.environ['BUILDTYPE'] = self._step.configuration
+    print 'BUILDTYPE="%s"' % os.environ['BUILDTYPE']
+    cmd = [os.path.join('platform_tools', 'android', 'bin', 'android_ninja'),
            target,
            '-d', self._step.args['device'],
-           'BUILDTYPE=%s' % self._step.configuration,
            ]
-    cmd.extend(self._step.default_make_flags)
+    cmd.extend(self._step.default_ninja_flags)
     if os.name != 'nt':
       try:
         ccache = shell_utils.run(['which', 'ccache']).rstrip()
         if ccache:
           os.environ['ANDROID_MAKE_CCACHE'] = ccache
       except Exception:
         pass
     cmd.extend(self._step.make_flags)
     shell_utils.run(cmd)
 
@@ skipping 13 matching lines @@
                         gm_actual_dir=prefix + 'gm_actual',
                         gm_expected_dir=prefix + 'gm_expected',
                         resource_dir=prefix + 'resources',
                         skimage_in_dir=prefix + 'skimage_in',
                         skimage_expected_dir=prefix + 'skimage_expected',
                         skimage_out_dir=prefix + 'skimage_out',
                         skp_dir=prefix + 'skp',
                         skp_perf_dir=prefix + 'skp_perf',
                         skp_out_dir=prefix + 'skp_out',
                         tmp_dir=prefix + 'tmp_dir')