Allow windows ASAN build to work
Rolls DEPS for syzygy r1083 => r1194. Changelog is too long to put here. BUG=152226 Review URL: https://chromiumcodereview.appspot.com/11377146 git-svn-id: http://src.chromium.org/svn/trunk/src/build@169136 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
57b938cfa2
Коммит
ddbec33f5e
2
all.gyp
2
all.gyp
|
@ -167,7 +167,7 @@
|
|||
'target_name': 'All_syzygy',
|
||||
'type': 'none',
|
||||
'conditions': [
|
||||
['OS=="win" and fastbuild==0', {
|
||||
['OS=="win" and fastbuild==0 and asan!=1', {
|
||||
'dependencies': [
|
||||
'../chrome/installer/mini_installer_syzygy.gyp:*',
|
||||
],
|
||||
|
|
11
common.gypi
11
common.gypi
|
@ -1366,7 +1366,7 @@
|
|||
'grit_defines': ['-D', 'enable_web_intents_tag'],
|
||||
}],
|
||||
|
||||
['asan==1', {
|
||||
['asan==1 and OS!="win"', {
|
||||
'clang%': 1,
|
||||
}],
|
||||
['asan==1 and OS=="mac"', {
|
||||
|
@ -1749,6 +1749,15 @@
|
|||
'USE_SKIA=1',
|
||||
],
|
||||
}],
|
||||
['asan==1 and OS=="win"', {
|
||||
# Since asan on windows uses Syzygy, we need /PROFILE turned on to
|
||||
# produce appropriate pdbs.
|
||||
'msvs_settings': {
|
||||
'VCLinkerTool': {
|
||||
'Profile': 'true',
|
||||
},
|
||||
},
|
||||
}], # asan==1 and OS=="win"
|
||||
['coverage!=0', {
|
||||
'conditions': [
|
||||
['OS=="mac" or OS=="ios"', {
|
||||
|
|
Загрузка…
Ссылка в новой задаче