Import Mojo Changes

base/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 891 matching lines @@
       "files/file_path_watcher_fsevents.cc",
       "files/file_path_watcher_fsevents.h",
       "files/file_path_watcher_kqueue.cc",
       "files/file_path_watcher_kqueue.h",
     ]
   }
 
   # Linux.
   if (is_linux) {
     # TODO(brettw) this will need to be parameterized at some point.
-    linux_configs = [ "//build/config/linux:glib" ]
+    linux_configs = []
+    if (use_glib) {
+      linux_configs += [ "//build/config/linux:glib" ]
+    }
 
     configs += linux_configs
     all_dependent_configs = linux_configs
 
     defines += [ "USE_SYMBOLIZE" ]
 
     # These dependencies are not required on Android, and in the case
     # of xdg_mime must be excluded due to licensing restrictions.
     deps += [
       "//base/third_party/symbolize",
@@ skipping 473 matching lines @@
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     # TODO(GYP): dep on copy_test_data_ios action.
   }
 
   if (is_linux) {
     sources -= [ "file_version_info_unittest.cc" ]
     sources += [ "nix/xdg_util_unittest.cc" ]
     defines = [ "USE_SYMBOLIZE" ]
-    configs += [ "//build/config/linux:glib" ]
+    if (use_glib) {
+      configs += [ "//build/config/linux:glib" ]
+    }
   }
 
   if (!is_linux || use_ozone) {
     sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
   }
 
   if (is_posix || is_ios) {
     sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
     deps += [ "//third_party/libevent" ]
   }
@@ skipping 113 matching lines @@
   # GYP: //base.gyp:base_unittests_apk
   unittest_apk("base_unittests_apk") {
     deps = [
       ":base_java",
       ":base_java_unittest_support",
       ":base_unittests",
     ]
     unittests_dep = ":base_unittests"
   }
 }