From b86c5027a0ab701db21c052f0fd85d217eea9b57 Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 25 Nov 2015 13:20:05 -0800 Subject: [PATCH] Roll chromium_revision 68cf0b8..aa8e58a (361406:361601) Due to Chromium moving over to building with a sysroot image on Linux in https://chromium.googlesource.com/chromium/src/+/a931efd5dc8d8783ce73a64fc641627866b6869d we need to disable that until http://crbug.com/561584 is fixed (libudev.h is missing and is used by talk/media/devices/libudevsymboltable.h). Change log: https://chromium.googlesource.com/chromium/src/+log/68cf0b8..aa8e58a Full diff: https://chromium.googlesource.com/chromium/src/+/68cf0b8..aa8e58a No dependencies changed. No update to Clang. BUG=chromium:561584 CQ_EXTRA_TRYBOTS=tryserver.webrtc:win_baremetal,mac_baremetal,linux_baremetal NOTRY=True NOPRESUBMIT=True Review URL: https://codereview.webrtc.org/1468313006 Cr-Commit-Position: refs/heads/master@{#10795} --- DEPS | 2 +- webrtc/supplement.gypi | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 096068d784..71db592c90 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '68cf0b8360a8ea1dbcd5efb524e7831e1c22bd66', + 'chromium_revision': 'aa8e58a3274d31c25d15f909a2a9190149856b9b', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi index 7634a4150f..edccd4d81d 100644 --- a/webrtc/supplement.gypi +++ b/webrtc/supplement.gypi @@ -5,9 +5,14 @@ # Override the default (10.6) in Chromium's build/common.gypi. # Needed for ARC and libc++. 'mac_deployment_target%': '10.7', + # Disable use of sysroot for Linux. It's enabled by default in Chromium, + # but it currently lacks the libudev-dev package. + # TODO(kjellander): Remove when crbug.com/561584 is fixed. + 'use_sysroot': 0, }, 'webrtc_root%': '<(webrtc_root)', 'mac_deployment_target%': '<(mac_deployment_target)', + 'use_sysroot%': '<(use_sysroot)', 'build_with_chromium': 0, 'conditions': [ ['OS=="ios"', {