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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 1083543005: Remove use_allocator=none where it's implied. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_asan_no_lsan.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import pipes 5 import pipes
6 6
7 from slave.recipe_config import config_item_context, ConfigGroup 7 from slave.recipe_config import config_item_context, ConfigGroup
8 from slave.recipe_config import Dict, List, Single, Static, Set, BadConf 8 from slave.recipe_config import Dict, List, Single, Static, Set, BadConf
9 from slave.recipe_config_types import Path 9 from slave.recipe_config_types import Path
10 10
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 def official(c): 389 def official(c):
390 c.gyp_env.GYP_DEFINES['branding'] = 'Chrome' 390 c.gyp_env.GYP_DEFINES['branding'] = 'Chrome'
391 c.gyp_env.GYP_DEFINES['buildtype'] = 'Official' 391 c.gyp_env.GYP_DEFINES['buildtype'] = 'Official'
392 c.compile_py.mode = 'official' 392 c.compile_py.mode = 'official'
393 393
394 @config_ctx(deps=['compiler']) 394 @config_ctx(deps=['compiler'])
395 def asan(c): 395 def asan(c):
396 if 'clang' not in c.compile_py.compiler: # pragma: no cover 396 if 'clang' not in c.compile_py.compiler: # pragma: no cover
397 raise BadConf('asan requires clang') 397 raise BadConf('asan requires clang')
398 c.runtests.swarming_tags |= {'asan:1'} 398 c.runtests.swarming_tags |= {'asan:1'}
399 if c.TARGET_PLATFORM == 'linux':
400 c.gyp_env.GYP_DEFINES['use_allocator'] = 'none'
401 if c.TARGET_PLATFORM in ['mac', 'win']: 399 if c.TARGET_PLATFORM in ['mac', 'win']:
402 # Set fastbuild=0 and prevent other configs from changing it. 400 # Set fastbuild=0 and prevent other configs from changing it.
403 fastbuild(c, invert=True, optional=False) 401 fastbuild(c, invert=True, optional=False)
404 402
405 c.gyp_env.GYP_DEFINES['asan'] = 1 403 c.gyp_env.GYP_DEFINES['asan'] = 1
406 c.gyp_env.GYP_DEFINES['lsan'] = 1 404 c.gyp_env.GYP_DEFINES['lsan'] = 1
407 405
408 @config_ctx(deps=['compiler']) 406 @config_ctx(deps=['compiler'])
409 def lsan(c): 407 def lsan(c):
410 c.runtests.enable_lsan = True 408 c.runtests.enable_lsan = True
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 c.compile_py.goma_dir = None 776 c.compile_py.goma_dir = None
779 c.gyp_env.GYP_DEFINES['use_goma'] = 0 777 c.gyp_env.GYP_DEFINES['use_goma'] = 0
780 778
781 @config_ctx() 779 @config_ctx()
782 def chromium_deterministic_build(c): 780 def chromium_deterministic_build(c):
783 c.gyp_env.GYP_DEFINES['dont_embed_build_metadata'] = 1 781 c.gyp_env.GYP_DEFINES['dont_embed_build_metadata'] = 1
784 782
785 @config_ctx(includes=['chromium_clang']) 783 @config_ctx(includes=['chromium_clang'])
786 def cast_linux(c): 784 def cast_linux(c):
787 c.gyp_env.GYP_DEFINES['chromecast'] = 1 785 c.gyp_env.GYP_DEFINES['chromecast'] = 1
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_asan_no_lsan.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698