Merge pull request #2071 from kulakowski/build-stuff

Remove use_glib gn variable

engine/src/flutter/build/config/BUILD.gn

@@ -115,9 +115,6 @@ config("feature_flags") {
   if (use_default_render_theme) {
     defines += [ "USE_DEFAULT_RENDER_THEME=1" ]
   }
-  if (use_glib) {
-    defines += [ "USE_GLIB=1" ]
-  }
   if (use_openssl) {
     defines += [ "USE_OPENSSL=1" ]
   }

engine/src/flutter/build/config/linux/BUILD.gn

@@ -43,15 +43,6 @@ pkg_config("freetype2") {
   packages = [ "freetype2" ]
 }
 
-pkg_config("glib") {
-  packages = [
-    "glib-2.0",
-    "gmodule-2.0",
-    "gobject-2.0",
-    "gthread-2.0",
-  ]
-}
-
 pkg_config("pangocairo") {
   packages = [ "pangocairo" ]
 }

engine/src/flutter/build/config/ui.gni

@@ -41,13 +41,8 @@ declare_args() {
 #
 # These variables depend on other variables and can't be set externally.
 
-if (is_linux && use_glib) {
-  use_cairo = true
-  use_pango = true
-} else {
-  use_cairo = false
-  use_pango = false
-}
+use_cairo = false
+use_pango = false
 
 # Use GPU accelerated cross process image transport by default on linux builds
 # with the Aura window manager.

engine/src/flutter/sky/tools/gn

@@ -58,7 +58,6 @@ def to_gn_args(args):
           gn_args['dart_target_arch'] = ios_target_cpu
     else:
         gn_args['use_aura'] = False
-        gn_args['use_glib'] = False
         gn_args['use_system_harfbuzz'] = False
 
     if args.target_os in ['android', 'ios'] and not args.simulator: