Skia: Supply --gcc to android_ninja when appropriate

scripts/slave/recipe_modules/skia/android_flavor.py

 # Copyright 2014 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.
 
 
 import android_devices
 import copy
 import default_flavor
 
 
@@ skipping 93 matching lines @@
   def compile(self, target):
     """Build the given target."""
     env = dict(self._default_env)
     ccache = self._skia_api.ccache()
     if ccache:
       env['ANDROID_MAKE_CCACHE'] = ccache
 
     cmd = [self.android_bin.join('android_ninja'), target, '-d', self.device]
     if 'Clang' in self._skia_api.builder_name:
       cmd.append('--clang')
+    if 'GCC' in self._skia_api.builder_name:
+      cmd.append('--gcc')
     self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd,
                        env=env, cwd=self._skia_api.m.path['checkout'])
 
   def device_path_join(self, *args):
     """Like os.path.join(), but for paths on a connected Android device."""
     return '/'.join(args)
 
   def device_path_exists(self, path):
     """Like os.path.exists(), but for paths on a connected device."""
     exists_str = 'FILE_EXISTS'
@@ skipping 143 matching lines @@
     ).stdout.rstrip()
     prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dir=prefix + 'skp/skps',
         tmp_dir=prefix + 'tmp_dir')