From b58fe9b89965ba8cbfe4b5630bb1f6cdc2755fda Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 7 Sep 2016 05:12:34 -0700 Subject: GN: turn off ccache I just burned 2 days debugging a confusing interaction between ccache and the -fsanitize-blacklist argument to Clang. Let's see if we can live without ccache (swarming affinity + Ninja seems pretty decent). As a point of reference, the Mac bots have been looking for ccache but failing to find it. They're proof this will be fine. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2310063003 Review-Url: https://codereview.chromium.org/2310063003 --- infra/bots/recipe_modules/flavor/gn_android_flavor.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'infra/bots/recipe_modules/flavor/gn_android_flavor.py') diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 12832ecc83..4cbaab38a6 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -22,19 +22,10 @@ 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 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), -- cgit v1.2.3