Roll chromium_revision 260462:266514

Unfortunately needs to introduce yet another workaround
script for the Visual Studio toolchain download.

This will resolve the failures with our Dr Memory Full bot
(see https://code.google.com/p/chromium/issues/detail?id=366637#c2
for details). Long term, I'm considering a better approach
than using the added gclient solution pointing at
svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/drmemory/drmemory.DEPS
i.e. add an entry that we roll separately in our DEPS file
instead. However, the Dr Memory team assured that changes
in their reporting format like this are rare.

Thanks fischman@ for the video_render.gypi fix!
Thanks kma@ for the transform_neon.S fix even if it turned out
not to be needed right now (probably will come back).

BUG=chromium:366637
TEST=git try -t compile
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13369007

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6010 4adac7df-926f-26a2-2b94-8c16560cd09d

4 files changed, 38 insertions, 1 deletions

diff --git a/build/download_vs_toolchain.py b/build/download_vs_toolchain.py
new file mode 100644
index 00000000..2462bdce
--- /dev/null
+++ b/build/download_vs_toolchain.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2014 The WebRTC 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.
+
+# This script is used to run the vs_toolchain.py script to download the
+# Visual Studio toolchain. It's just a temporary measure while waiting for the
+# Chrome team to move find_depot_tools into src/build to get rid of these
+# workarounds (similar one in gyp_webrtc).
+
+import os
+import sys
+
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+checkout_root = os.path.abspath(os.path.join(script_dir, os.pardir, os.pardir))
+sys.path.insert(0, os.path.join(checkout_root, 'build'))
+sys.path.insert(0, os.path.join(checkout_root, 'tools', 'find_depot_tools'))
+
+
+import vs_toolchain
+
+
+if __name__ == '__main__':
+  sys.exit(vs_toolchain.main())
diff --git a/build/gyp_webrtc b/build/gyp_webrtc
index 68add4b2..4d5ae791 100755
--- a/build/gyp_webrtc
+++ b/build/gyp_webrtc
@@ -63,7 +63,7 @@ if __name__ == '__main__':
 
   vs2013_runtime_dll_dirs = None
   if int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')):
-    vs2013_runtime_dll_dirs = vs_toolchain.DownloadVsToolchain()
+    vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
 
   # Enforce gyp syntax checking. This adds about 20% execution time.
   args.append('--check')
diff --git a/modules/video_render/video_render.gypi b/modules/video_render/video_render.gypi
index a3c0f6d5..3cb61678 100644
--- a/modules/video_render/video_render.gypi
+++ b/modules/video_render/video_render.gypi
@@ -87,6 +87,12 @@
             'android/video_render_android_surface_view.cc',
             'android/video_render_opengles20.cc',
           ],
+        }, {
+          'all_dependent_settings': {
+            'libraries': [
+              '-lGLESv2',
+            ],
+          },
         }],
         ['OS!="ios" or include_internal_video_render==0', {
           'sources!': [
diff --git a/supplement.gypi b/supplement.gypi
index 7898d4cb..2fad5745 100644
--- a/supplement.gypi
+++ b/supplement.gypi
@@ -1,5 +1,6 @@
 {
   'variables': {
     'build_with_chromium': 0,
+    'use_sanitizer_options': 0,
   }
 }