| Index: masters/master.tryserver.webrtc/master.cfg
|
| diff --git a/masters/master.tryserver.webrtc/master.cfg b/masters/master.tryserver.webrtc/master.cfg
|
| index 8a0eb72251cd4800c1b909e31da3c632c1288381..a0af609b7d07a8ba2422f6997a58423279e95e54 100755
|
| --- a/masters/master.tryserver.webrtc/master.cfg
|
| +++ b/masters/master.tryserver.webrtc/master.cfg
|
| @@ -90,7 +90,6 @@ baremetal_linux_tests = baremetal_common_tests + [
|
| 'libjingle_peerconnection_java_unittest',
|
| ]
|
|
|
| -asan_gyp_defines = 'asan=1 release_extra_cflags=-g linux_use_tcmalloc=0'
|
| options = ['--clobber-post-fail', '--compiler=goma']
|
| clang_options = ['--clobber-post-fail', '--compiler=goma-clang']
|
| win_factory_prop = {
|
| @@ -231,8 +230,7 @@ b_mac_asan = {
|
| tests=tests,
|
| factory_properties={
|
| 'asan': True,
|
| - 'gclient_env': {'GYP_DEFINES': asan_gyp_defines,
|
| - 'GYP_GENERATORS': 'ninja'},
|
| + 'gclient_env': {'GYP_DEFINES': 'asan=1 release_extra_cflags=-g'},
|
| }),
|
| }
|
|
|
| @@ -320,7 +318,9 @@ b_linux_asan = {
|
| 'asan': True,
|
| 'sharded_tests': tests,
|
| 'force_isolated': True,
|
| - 'gclient_env': {'GYP_DEFINES': asan_gyp_defines},
|
| + 'gclient_env': {'GYP_DEFINES': ('asan=1 release_extra_cflags=-g '
|
| + 'use_allocator=none'),
|
| + },
|
| }),
|
| }
|
|
|
|
|