Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1279)

Unified Diff: scripts/slave/recipe_modules/skia/android_flavor.py

Issue 1917953002: Skia: Supply --gcc to android_ninja when appropriate (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-Arm7-Debug-Android.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/skia/android_flavor.py
diff --git a/scripts/slave/recipe_modules/skia/android_flavor.py b/scripts/slave/recipe_modules/skia/android_flavor.py
index b4db419644bd341841761a7101a57a281c8656ae..27a514e712de70c42778875314a23d589cfed433 100644
--- a/scripts/slave/recipe_modules/skia/android_flavor.py
+++ b/scripts/slave/recipe_modules/skia/android_flavor.py
@@ -111,6 +111,8 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
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'])
« no previous file with comments | « no previous file | scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-Arm7-Debug-Android.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698