From 81d6597dc736f2318b9d2bfddf25f7f33d82f3e7 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 18 Jul 2016 16:30:49 -0700 Subject: [PATCH] Roll chromium_revision 7fa6701bc5..1a73d11e65 (398458:399420) A fix was needed to make Android tests pass after https://codereview.chromium.org/2043803003 Change log: https://chromium.googlesource.com/chromium/src/+log/7fa6701bc5..1a73d11e65 Full diff: https://chromium.googlesource.com/chromium/src/+/7fa6701bc5..1a73d11e65 Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/8dd3c8e39a..099f1da55b * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/0fc7df55c0..171b5403ee * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/7f03319b9d..bcb8b67b8b DEPS diff: https://chromium.googlesource.com/chromium/src/+/7fa6701bc5..1a73d11e65/DEPS No update to Clang. TBR=kjellander@chromium.org BUG=libyuv:626,webrtc:5990 Review URL: https://codereview.chromium.org/2156913004 . --- DEPS | 2 +- build_overrides/build.gni | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 25f6a3218..1f3d6c52f 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': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4', + 'chromium_revision': '1a73d11e65f5af4fc946a00ed1a2b7022ed28c64', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 6d3aa1ebc..7979c31d8 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -13,3 +13,10 @@ # remove this when Chromium drops 10.6 support and also requires 10.7. mac_sdk_min_build_override = "10.11" mac_deployment_target_build_override = "10.7" + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = true + +# Variable that can be used to support multiple build scenarios, like having +# Chromium specific targets in a client project's GN file etc. +build_with_chromium = false