gistfile1.txt

diff --git a/tools/gn b/tools/gn
index 963e2f3f9..3905798ac 100755
--- a/tools/gn
+++ b/tools/gn
@@ -92,13 +92,18 @@ def to_gn_args(args):
     gn_args['skia_use_expat'] = args.target_os == 'android'
     gn_args['skia_use_fontconfig'] = args.enable_fontconfig
     gn_args['flutter_use_fontconfig'] = args.enable_fontconfig
-    gn_args['flutter_enable_skshaper'] = args.enable_skshaper
     gn_args['is_official_build'] = True    # Disable Skia test utilities.
     gn_args['dart_component_kind'] = 'static_library' # Always link Dart in statically.
     gn_args['is_debug'] = args.unoptimized
     gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized
     gn_args['is_clang'] = not sys.platform.startswith(('cygwin', 'win'))
 
+    if args.enable_skshaper:
+      gn_args['flutter_enable_skshaper'] = True
+      gn_args['skia_enable_skparagraph'] = True
+      gn_args['skia_use_harfbuzz'] = True # For skia_enable_skparagraph
+      gn_args['skia_use_icu'] = True # For skia_enable_skparagraph
+
     if args.target_os == 'android' or args.target_os == 'ios':
       gn_args['skia_gl_standard'] = 'gles'
     else: