From 9e430982a1b1c13f0607ee01f2d37dd94a366378 Mon Sep 17 00:00:00 2001 From: "kjellander@google.com" Date: Sun, 21 Sep 2014 20:17:00 +0000 Subject: [PATCH] Roll chromium_revision 280149:291168 and remove sanitizer_options.cc hack. This is a temporary solution to fix the compile error in preparation for moving the bots over to recipes so that https://review.webrtc.org/24619004/ can be landed. TBR=fbarchard@google.com TESTED=passing local compile on Linux. Review URL: https://webrtc-codereview.appspot.com/28549004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1087 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- DEPS | 8 +------- tools/supplement.gypi | 31 ------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 tools/supplement.gypi diff --git a/DEPS b/DEPS index 2fae824f0..ecdaea987 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { "chromium_trunk" : "http://src.chromium.org/svn/trunk", # chrome://version/ for revision of canary Chrome. # http://chromium-status.appspot.com/lkgr is a last known good revision. - "chromium_revision": "280149", + "chromium_revision": "291168", } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than @@ -57,12 +57,6 @@ deps = { "tools/python": Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"), - "tools/sanitizer_options": - File(Var("chromium_trunk") + "/src/base/debug/sanitizer_options.cc@" + Var("chromium_revision")), - - "tools/tsan_suppressions": - File(Var("chromium_trunk") + "/src/base/debug/tsan_suppressions.cc@" + Var("chromium_revision")), - "tools/valgrind": Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"), diff --git a/tools/supplement.gypi b/tools/supplement.gypi deleted file mode 100644 index c1cff3f6d..000000000 --- a/tools/supplement.gypi +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2011 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -# Supplement file for libyuv. To be processed, this file needs to be located in -# the first level of directories below the gyp_libyuv file. - -# This is needed to workaround the otherwise failing include of base.gyp in -# Chromium's common.gypi when a sanitizer tool is used. -{ - 'variables': { - 'use_sanitizer_options': 0, - }, - 'target_defaults': { - 'conditions': [ - # Add default sanitizer options similar to Chromium. This is needed to get - # the sanitizer options that has LeakSanitizer disabled by default. - # Otherwise yasm will throw leak errors during compile when - # GYP_DEFINES="asan=1". - ['OS=="linux" and (chromeos==0 or target_arch!="ia32")', { - 'dependencies': [ - '<(DEPTH)/tools/sanitizer_options.gyp:sanitizer_options', - ], - }], - ], - }, -}