diff options
Diffstat (limited to 'infra/bots/recipe_modules')
-rw-r--r-- | infra/bots/recipe_modules/flavor/gn_android_flavor.py | 9 | ||||
-rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 9 |
2 files changed, 0 insertions, 18 deletions
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), diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 31b4756be0..18a03e1a6e 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -40,14 +40,6 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): elif compiler == 'GCC': cc, cxx = 'gcc', 'g++' - compiler_prefix = "" - ccache = self.m.run.ccache() - if ccache: - compiler_prefix = ccache - if compiler == 'Clang': - # Stifle "argument unused during compilation: ..." warnings. - extra_cflags.append('-Qunused-arguments') - if extra_config == 'Fast': extra_cflags.extend(['-march=native', '-fomit-frame-pointer', '-O3']) if extra_config.startswith('SK'): @@ -57,7 +49,6 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted({ 'cc': quote(cc), 'cxx': quote(cxx), - 'compiler_prefix': quote(compiler_prefix), 'extra_cflags': quote(' '.join(extra_cflags)), 'extra_ldflags': quote(' '.join(extra_ldflags)), 'is_debug': 'true' if configuration == 'Debug' else 'false', |