From 75ba51938ce3d6879be5f73fd5d5d5efcd164017 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 11 Jan 2013 16:04:50 +0000 Subject: [PATCH] Updating chromium_revision 169394:176094 This resolves ninja error on Windows due to recent depot_tools update, since a newer GYP will be synced. Initially we ran into a compile issue with libvpx: http://code.google.com/p/webm/issues/detail?id=521 The change in libvpx.gyp is needed since the newer version of Clang that is used with this Chromium revision provides the -fsanitize=address flag instead of the old (now deprecated) -faddress-sanitizer. Without disabling them when asan=1, we'll get compile errors for the assembly offsets generated for Libvpx. See http://crbug.com/159580 for more details. BUG=libyuv:173 TEST=trybots passing. Review URL: https://webrtc-codereview.appspot.com/1026004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3361 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- third_party/libvpx/libvpx.gyp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index f5009e2233..fda29b83bd 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "169394", + "chromium_revision": "176094", # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index b63bef3550..a13e975204 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -347,11 +347,11 @@ ], 'conditions': [ ['asan==1', { - 'cflags!': [ '-faddress-sanitizer', ], + 'cflags!': [ '-fsanitize=address', ], 'xcode_settings': { - 'OTHER_CFLAGS!': [ '-faddress-sanitizer', ], + 'OTHER_CFLAGS!': [ '-fsanitize=address', ], }, - 'ldflags!': [ '-faddress-sanitizer', ], + 'ldflags!': [ '-fsanitize=address', ], }], ], 'sources': [