Switch to Harfbuzz 1.5.0 from Fuchsia. (#4006)

2e46f6ff · Chinmay Garde · GitHub · 78d99d4e · 2e46f6ff · 2e46f6ff
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

DEPS DEPS +4 -1

tools/gn tools/gn +0 -1

未找到文件。
--- 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

--- 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':