AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GN: forgot Clang+ccache fix on Android. And sort.

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2298203002

No trybots for these yet...
NOTRY=true
TBR=jcgregorio@google.com

Review-Url: https://codereview.chromium.org/2298203002
This commit is contained in:
mtklein 2016-08-31 05:03:31 -07:00 committed by Commit bot
parent cd01b03df8
commit 272b311298
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/bots/recipe_modules/flavor/gn_android_flavor.py
View File

@ -18,19 +18,22 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
assert compiler == 'Clang' # At this rate we might not ever support GCC.
compiler_prefix = ''
extra_cflags = []
ccache = self.m.run.ccache()
if ccache:
compiler_prefix = ccache
extra_cflags.append('-Qunused-arguments')
ndk_asset = 'android_ndk_linux' if os == 'Ubuntu' else 'android_ndk_darwin'
quote = lambda x: '"%s"' % x
gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in {
gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted({
'compiler_prefix': quote(compiler_prefix),
'extra_cflags': quote(' '.join(extra_cflags)),
'is_debug': 'true' if configuration == 'Debug' else 'false',
'ndk': quote(self.m.vars.slave_dir.join(ndk_asset)),
'target_cpu': quote(target_arch),
}.iteritems())
}.iteritems()))
run = lambda title, cmd: self.m.run(self.m.step, title, cmd=cmd,
cwd=self.m.vars.skia_dir, **kwargs)

2
infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json
View File

@ -127,7 +127,7 @@
"gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android/Debug",
"--args=is_debug=true compiler_prefix=\"/usr/bin/ccache\" ndk=\"[SLAVE_BUILD]/android_ndk_darwin\" target_cpu=\"mipsel\""
"--args=compiler_prefix=\"/usr/bin/ccache\" extra_cflags=\"-Qunused-arguments\" is_debug=true ndk=\"[SLAVE_BUILD]/android_ndk_darwin\" target_cpu=\"mipsel\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json
View File

@ -127,7 +127,7 @@
"gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android/Release",
"--args=is_debug=false compiler_prefix=\"/usr/bin/ccache\" ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\""
"--args=compiler_prefix=\"/usr/bin/ccache\" extra_cflags=\"-Qunused-arguments\" is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {