From be984a8b9a130671c098920600ffb44cbb559340 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Tue, 15 Dec 2015 12:05:32 -0800 Subject: [PATCH] Bump chromium version and disable use_sysroot=0 TBR=harryjin@google.com BUG=libyuv:534 Review URL: https://codereview.chromium.org/1526163002 . --- DEPS | 2 +- libyuv.gyp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 2299443bd..75550fcb5 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { # Roll the Chromium Git hash to pick up newer versions of all the # dependencies and tools linked to in setup_links.py. - 'chromium_revision': 'ec6107434ebf366554bb2af162d602ff34d480c1', + 'chromium_revision': 'aa8e58a3274d31c25d15f909a2a9190149856b9b', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/libyuv.gyp b/libyuv.gyp index 3d8cb3595..4e42312fc 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -17,6 +17,13 @@ 'GCC_PRECOMPILE_PREFIX_HEADER': 'NO', }, 'variables': { + 'variables': { + # 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, + }, + 'use_sysroot%': '<(use_sysroot)', 'use_system_libjpeg%': 0, 'libyuv_disable_jpeg%': 0, # 'chromium_code' treats libyuv as internal and increases warning level.