From 2e46f6ff755cc18a2357aec3629492410af5dced Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Fri, 25 Aug 2017 12:57:43 -0700 Subject: [PATCH] Switch to Harfbuzz 1.5.0 from Fuchsia. (#4006) --- DEPS | 5 ++++- tools/gn | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 3c145665f67..45617b4d980 100644 --- a/DEPS +++ b/DEPS @@ -113,7 +113,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'baaae21dbb12b3d75c99498de79d503989d17e79', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '34c6084946b71a14b9a590db14c2b417ea5055d4', # Fuchsia compatibility # @@ -142,6 +142,9 @@ deps = { 'src/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292', + 'src/third_party/harfbuzz': + Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'a10951da60ca6712de4da5f18ec75c515dd8e5c1', + # Chromium-style # # As part of integrating with Fuchsia, we should eventually remove all these diff --git a/tools/gn b/tools/gn index 7a93a087e90..8bb2dec0736 100755 --- a/tools/gn +++ b/tools/gn @@ -83,7 +83,6 @@ def to_gn_args(args): if not args.simulator: aot = True else: - gn_args['use_system_harfbuzz'] = False aot = False if args.runtime_mode == 'debug':