diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 16:54:49 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 16:54:49 +0000 |
| commit | dce595ebb39ff70a494578367be5353527dc7720 (patch) | |
| tree | cc53f0789da4f5bc7581f5d91dc4fbe3c5d17130 | |
| parent | d77e93c5ce118936477418dd25da44f6adc14315 (diff) | |
| download | chromium_src-dce595ebb39ff70a494578367be5353527dc7720.zip chromium_src-dce595ebb39ff70a494578367be5353527dc7720.tar.gz chromium_src-dce595ebb39ff70a494578367be5353527dc7720.tar.bz2 | |
Revert 169592: Now that the libvpx roll is in, this should work.
- Revert 169589: Caused a bunch of
chromeos-chrome-25.0.1336.0_alpha-r1: /var/cache/chromeos-cache/distfiles/target/chrome-src/src/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse2.asm:58: error: undefined symbol `vp8_block_coeff' (first use)
Likely because third_party/libvpx/libvpx.gyp still uses the old form.
- Use new -fsanitize=address instead of deprecated -faddress-sanitizer
BUG=159580,162783
Review URL: https://codereview.chromium.org/11416192
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/11411191
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/11308229
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169670 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9d89186..0daf444 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2700,13 +2700,12 @@ 'target_conditions': [ ['_toolset=="target"', { 'cflags': [ - '-faddress-sanitizer', + '-fsanitize=address', '-fno-omit-frame-pointer', - # See http://crbug.com/159580 - '-w', + '-w', # http://crbug.com/162783 ], 'ldflags': [ - '-faddress-sanitizer', + '-fsanitize=address', ], 'defines': [ 'ADDRESS_SANITIZER', @@ -3164,9 +3163,8 @@ # Due to issues in Clang build system, using ASan on 32-bit # binaries on x86_64 host is problematic. # TODO(eugenis): re-enable. - '-faddress-sanitizer', - # See http://crbug.com/159580 - '-w', + '-fsanitize=address', + '-w', # http://crbug.com/162783 ], 'ldflags!': [ '-faddress-sanitizer', @@ -3287,9 +3285,8 @@ ['asan==1', { 'xcode_settings': { 'OTHER_CFLAGS': [ - '-faddress-sanitizer', - # See http://crbug.com/159580 - '-w', + '-fsanitize=address', + '-w', # http://crbug.com/162783 ], }, 'defines': [ |