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

Unified Diff: printing/printing.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 | « net/net.gyp ('k') | tools/gtk_clipboard_dump/gtk_clipboard_dump.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing.gyp
diff --git a/printing/printing.gyp b/printing/printing.gyp
index bd4940dd6d160d8ee5300a0637f58e94680bffbe..6d3f353be6fd5f88dc69e8f5fa7789f69534cf95 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -98,16 +98,6 @@
'dependencies': [
'<(DEPTH)/ui/aura/aura.gyp:aura',
],
- }],
- ['toolkit_uses_gtk == 0',{
- 'sources/': [['exclude', '_cairo\\.cc$']]
- }, { # else: toolkit_uses_gtk == 1
- 'dependencies': [
- # For FT_Init_FreeType and friends.
- '../build/linux/system.gyp:freetype2',
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:gtkprint',
- ],
}],
# Mac-Aura does not support printing.
['OS=="mac" and use_aura==1',{
@@ -255,7 +245,6 @@
'units_unittest.cc',
],
'conditions': [
- ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}],
['use_cups==1', {
@@ -266,11 +255,6 @@
'backend/cups_helper_unittest.cc',
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
« no previous file with comments | « net/net.gyp ('k') | tools/gtk_clipboard_dump/gtk_clipboard_dump.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698