From 25acef756b460e512c4f1c2feb0060c5a29ed0de Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 23 Apr 2018 11:17:50 +0200 Subject: [PATCH] Fixing "ninja -C out/ all". WebRTC was not able to build the "all" target because third_party/freetype and third_party/harfbuzz-ng were not correctly updated by gclient (because of a misconfigured DEPS file). TBR=phoglund@webrtc.org Bug: webrtc:9182 Change-Id: Ie5adc39431a31de2dfda0c91a18b9b8c8bee9eb5 Reviewed-on: https://webrtc-review.googlesource.com/71668 Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#22976} --- DEPS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DEPS b/DEPS index 656419121e..912bd04cae 100644 --- a/DEPS +++ b/DEPS @@ -33,6 +33,14 @@ vars = { # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. 'libfuzzer_revision': 'ba2c1cd6f87accb32b5dbce297387c56a2e53a2f', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling freetype + # and whatever else without interference from each other. + 'freetype_revision': '26ad1acbcb4ca9e25163bd102971c8f0e1b56d87', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling HarfBuzz + # and whatever else without interference from each other. + 'harfbuzz_revision': '957e7756634a4fdf1654041e20e883cf964ecac9', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency @@ -91,6 +99,10 @@ deps = { 'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', }, + 'src/third_party/freetype/src': + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_revision'), + 'src/third_party/harfbuzz-ng/src': + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + Var('harfbuzz_revision'), # WebRTC-only dependency (not present in Chromium). 'src/third_party/gtest-parallel': Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'a8f5453ffc8d6c55a456d3b8395801c3aea9c714',