Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1620)

Unified Diff: base/BUILD.gn

Issue 1442523002: Get rid of the use_glib gn variable. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/message_loop/message_pump_glib.h » ('j') | ui/events/platform/x11/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 089610fb3f19e791092ecf72fc39497e3320826c..eb260f6427f06a95e160d87b02ac2890eeb0ec46 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -330,8 +330,6 @@ component("base") {
"message_loop/message_pump_android.h",
"message_loop/message_pump_default.cc",
"message_loop/message_pump_default.h",
- "message_loop/message_pump_glib.cc",
- "message_loop/message_pump_glib.h",
"message_loop/message_pump_io_ios.cc",
"message_loop/message_pump_io_ios.h",
"message_loop/message_pump_libevent.cc",
@@ -789,9 +787,6 @@ component("base") {
if (is_linux) {
# TODO(brettw) this will need to be parameterized at some point.
linux_configs = []
- if (use_glib) {
- linux_configs += [ "//build/config/linux:glib" ]
- }
configs += linux_configs
all_dependent_configs = linux_configs
@@ -819,13 +814,6 @@ component("base") {
}
}
- if (!use_glib) {
- sources -= [
- "message_loop/message_pump_glib.cc",
- "message_loop/message_pump_glib.h",
- ]
- }
-
configs += [ "//build/config/compiler:wexit_time_destructors" ]
if (is_android && !is_debug) {
configs -= [ "//build/config/compiler:optimize" ]
@@ -1178,7 +1166,6 @@ test("base_unittests") {
"message_loop/message_loop_proxy_impl_unittest.cc",
"message_loop/message_loop_proxy_unittest.cc",
"message_loop/message_loop_unittest.cc",
- "message_loop/message_pump_glib_unittest.cc",
"message_loop/message_pump_io_ios_unittest.cc",
"metrics/bucket_ranges_unittest.cc",
"metrics/field_trial_unittest.cc",
@@ -1370,14 +1357,6 @@ test("base_unittests") {
sources -= [ "file_version_info_unittest.cc" ]
sources += [ "nix/xdg_util_unittest.cc" ]
deps += [ "//base/test:malloc_wrapper" ]
-
- if (use_glib) {
- configs += [ "//build/config/linux:glib" ]
- }
- }
-
- if (!is_linux || use_ozone) {
viettrungluu 2015/11/12 02:35:41 This condition was obviously wrong.
jamesr 2015/11/12 02:38:41 This is the same as !use_glib, i think, so it's tr
- sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
}
if (is_posix || is_ios) {
« no previous file with comments | « no previous file | base/message_loop/message_pump_glib.h » ('j') | ui/events/platform/x11/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698