| commit | 68208897bea5638a03ed1db7ff5222a61016ec27 | [log] [tgz] |
|---|---|---|
| author | kjellander <kjellander@webrtc.org> | Thu Jun 16 23:29:30 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Jun 17 06:29:38 2016 +0000 |
| tree | 03e0dd7a1d7561e31ebd5ae849135ff12cb66fe9 | |
| parent | d1523ca38f98bd4e46faabcd2db57fad1e8ad154 [diff] [blame] |
Roll chromium_revision 7fa6701bc5..1a73d11e65 (398458:399420) A fix was needed to make Android tests pass after https://codereview.chromium.org/2043803003 Another fix was needed for the webrtc_perf_tests.isolate sinc eit was missing one file. 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= BUG=webrtc:5990 NOTRY=True Review-Url: https://codereview.webrtc.org/2074043002 Cr-Commit-Position: refs/heads/master@{#13178}
diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 1088355..da8a1d5 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni
@@ -13,6 +13,9 @@ 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