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