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

Unified Diff: base/base.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 months 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 | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 635749da3bd528c31c674098c683dc859500756f..e8759441588b0017b964192240b0f9632c4840c5 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -40,14 +40,6 @@
['chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
}],
- ['toolkit_uses_gtk==1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- 'export_dependent_settings': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
],
'dependencies': [
'symbolize',
@@ -251,12 +243,6 @@
'../third_party/icu/icu.gyp:icuuc',
],
'conditions': [
- ['toolkit_uses_gtk==1', {
- 'dependencies': [
- # i18n/rtl.cc uses gtk
- '../build/linux/system.gyp:gtk',
- ],
- }],
['OS == "win"', {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [
@@ -694,13 +680,10 @@
'file_version_info_unittest.cc',
],
'conditions': [
- [ 'toolkit_uses_gtk==1', {
+ [ 'desktop_linux==1', {
'sources': [
'nix/xdg_util_unittest.cc',
],
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ]
}],
],
}],
@@ -831,12 +814,6 @@
'base',
],
'conditions': [
- ['toolkit_uses_gtk==1', {
- 'dependencies': [
- # test_suite initializes GTK.
- '../build/linux/system.gyp:gtk',
- ],
- }],
['os_posix==0', {
'sources!': [
'test/scoped_locale.cc',
@@ -972,17 +949,6 @@
'PERF_TEST',
],
},
- 'conditions': [
- ['toolkit_uses_gtk==1', {
- 'dependencies': [
- # Needed to handle the #include chain:
- # base/test/perf_test_suite.h
- # base/test/test_suite.h
- # gtk/gtk.h
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ],
},
{
'target_name': 'sanitizer_options',
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698