diff options
| author | pkasting <pkasting@chromium.org> | 2015-08-26 03:35:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 10:35:58 +0000 |
| commit | abf57c3926331ce8f98f831c526581a038172445 (patch) | |
| tree | 8743736c92dece338b12bc683647a5a89fd41179 /build/common.gypi | |
| parent | 8a6d989860b06e71e552cd47004fc61422482a67 (diff) | |
| download | chromium_src-abf57c3926331ce8f98f831c526581a038172445.zip chromium_src-abf57c3926331ce8f98f831c526581a038172445.tar.gz chromium_src-abf57c3926331ce8f98f831c526581a038172445.tar.bz2 | |
Pull new version of protobuf sources.
This should fix some MSVC warnings (though, sadly, we now have to disable more
warnings than before... different ones). More importantly, it's the first full
source update (as opposed to cherry-picks) done in years, and includes a
complete README and sequence of patches to help future maintainers do similar
updates. (Several past changes just updated the README to mention a change
without supplying a patch or even pointing to the relevant Chrome revision.) My
hope is that this will make future source updates -- and maybe eventually
pulling directly from upstream via DEPS -- more feasible, so we don't get into a
similar state of having our local tree diverge so badly that only cherry-picks
are really doable.
BUG=81439
TEST=none
TBR=scottmg
Review URL: https://codereview.chromium.org/1291903002
Cr-Commit-Position: refs/heads/master@{#345578}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index b58fede..193c5f6 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2864,13 +2864,6 @@ }], ], }], - ['asan==1', { - 'defines': [ - 'ADDRESS_SANITIZER', - 'MEMORY_TOOL_REPLACES_ALLOCATOR', - 'MEMORY_SANITIZER_INITIAL_SIZE', - ], - }], ['syzyasan==1', { # SyzyAsan needs /PROFILE turned on to produce appropriate pdbs. 'msvs_settings': { @@ -3128,6 +3121,13 @@ ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 'defines': ['OS_CHROMEOS=1'], }], + ['<(asan)==1 and >(nacl_untrusted_build)==0', { + 'defines': [ + 'ADDRESS_SANITIZER', + 'MEMORY_TOOL_REPLACES_ALLOCATOR', + 'MEMORY_SANITIZER_INITIAL_SIZE', + ], + }], ['enable_wexit_time_destructors==1 and OS!="win"', { # TODO: Enable on Windows too, http://crbug.com/404525 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, |