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

Side by Side Diff: webkit/common/webkit_common.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/view_aura.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'enable_wexit_time_destructors': 1, 7 'enable_wexit_time_destructors': 1,
8 'chromium_code': 1 8 'chromium_code': 1
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'resource_response_info.cc', 46 'resource_response_info.cc',
47 'resource_response_info.h', 47 'resource_response_info.h',
48 'resource_type.cc', 48 'resource_type.cc',
49 'resource_type.h', 49 'resource_type.h',
50 'webkit_common_export.h', 50 'webkit_common_export.h',
51 'webpreferences.cc', 51 'webpreferences.cc',
52 'webpreferences.h', 52 'webpreferences.h',
53 ], 53 ],
54 54
55 'conditions': [ 55 'conditions': [
56 ['toolkit_uses_gtk == 1', {
57 'dependencies': [
58 '<(DEPTH)/build/linux/system.gyp:gtk',
59 ],
60 'sources/': [['exclude', '_x11\\.cc$']],
61 }],
62 ['use_aura==1 and use_x11==1', { 56 ['use_aura==1 and use_x11==1', {
63 'dependencies': [ 57 'dependencies': [
64 '<(DEPTH)/build/linux/system.gyp:xcursor', 58 '<(DEPTH)/build/linux/system.gyp:xcursor',
65 ], 59 ],
66 }], 60 }],
67 ['OS=="mac"', { 61 ['OS=="mac"', {
68 'link_settings': { 62 'link_settings': {
69 'libraries': [ 63 'libraries': [
70 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 64 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
71 ], 65 ],
72 }, 66 },
73 }], 67 }],
74 ['OS=="win"', { 68 ['OS=="win"', {
75 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 69 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
76 'msvs_disabled_warnings': [ 4800, 4267 ], 70 'msvs_disabled_warnings': [ 4800, 4267 ],
77 }], 71 }],
78 ], 72 ],
79 }, 73 },
80 ], 74 ],
81 } 75 }
OLDNEW
« no previous file with comments | « ui/views/view_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698