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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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 | « webkit/common/webpreferences.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'target_defaults': { 6 'target_defaults': {
7 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
8 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
9 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
10 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'webcursor_aurax11.cc', 92 'webcursor_aurax11.cc',
93 'webcursor_null.cc', 93 'webcursor_null.cc',
94 'webcursor_gtk.cc', 94 'webcursor_gtk.cc',
95 'webcursor_gtk_data.h', 95 'webcursor_gtk_data.h',
96 'webcursor_mac.mm', 96 'webcursor_mac.mm',
97 'webcursor_win.cc', 97 'webcursor_win.cc',
98 'weburlrequest_extradata_impl.cc', 98 'weburlrequest_extradata_impl.cc',
99 'weburlrequest_extradata_impl.h', 99 'weburlrequest_extradata_impl.h',
100 'weburlresponse_extradata_impl.cc', 100 'weburlresponse_extradata_impl.cc',
101 'weburlresponse_extradata_impl.h', 101 'weburlresponse_extradata_impl.h',
102 '../common/webpreferences.cc',
103 '../common/webpreferences.h',
102 ], 104 ],
103 105
104 'conditions': [ 106 'conditions': [
105 ['toolkit_uses_gtk == 1', { 107 ['toolkit_uses_gtk == 1', {
106 'dependencies': [ 108 'dependencies': [
107 '<(DEPTH)/build/linux/system.gyp:gtk', 109 '<(DEPTH)/build/linux/system.gyp:gtk',
108 ], 110 ],
109 'sources/': [['exclude', '_x11\\.cc$']], 111 'sources/': [['exclude', '_x11\\.cc$']],
110 }], 112 }],
111 ['use_aura==1', { 113 ['use_aura==1', {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 150
149 { 151 {
150 'target_name': 'glue_renderer', 152 'target_name': 'glue_renderer',
151 'type': '<(component)', 153 'type': '<(component)',
152 'variables': { 'enable_wexit_time_destructors': 1, }, 154 'variables': { 'enable_wexit_time_destructors': 1, },
153 'defines': [ 155 'defines': [
154 'WEBKIT_EXTENSIONS_IMPLEMENTATION', 156 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
155 'WEBKIT_GLUE_IMPLEMENTATION', 157 'WEBKIT_GLUE_IMPLEMENTATION',
156 ], 158 ],
157 'dependencies': [ 159 'dependencies': [
160 '<(DEPTH)/base/base.gyp:base',
158 '<(DEPTH)/base/base.gyp:base_i18n', 161 '<(DEPTH)/base/base.gyp:base_i18n',
159 '<(DEPTH)/base/base.gyp:base', 162 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
163 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
160 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 164 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
161 'glue_common', 165 'glue_common',
162 ], 166 ],
163 167
164 'include_dirs': [ 168 'include_dirs': [
165 '<(INTERMEDIATE_DIR)', 169 '<(INTERMEDIATE_DIR)',
166 '<(SHARED_INTERMEDIATE_DIR)/webkit', 170 '<(SHARED_INTERMEDIATE_DIR)/webkit',
167 ], 171 ],
168 172
169 'sources': [ 173 'sources': [
170 '../renderer/cpp_bound_class.cc', 174 '../renderer/cpp_bound_class.cc',
171 '../renderer/cpp_bound_class.h', 175 '../renderer/cpp_bound_class.h',
172 '../renderer/cpp_variant.cc', 176 '../renderer/cpp_variant.cc',
173 '../renderer/cpp_variant.h', 177 '../renderer/cpp_variant.h',
178 '../renderer/webpreferences_renderer.cc',
174 ], 179 ],
175 }, 180 },
176 181
177 { 182 {
178 'target_name': 'glue', 183 'target_name': 'glue',
179 'type': '<(component)', 184 'type': '<(component)',
180 'variables': { 'enable_wexit_time_destructors': 1, }, 185 'variables': { 'enable_wexit_time_destructors': 1, },
181 'defines': [ 186 'defines': [
182 'WEBKIT_EXTENSIONS_IMPLEMENTATION', 187 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
183 'WEBKIT_GLUE_IMPLEMENTATION', 188 'WEBKIT_GLUE_IMPLEMENTATION',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 'webfileutilities_impl.h', 265 'webfileutilities_impl.h',
261 'webkit_glue.cc', 266 'webkit_glue.cc',
262 'webkit_glue.h', 267 'webkit_glue.h',
263 'webkit_glue_export.h', 268 'webkit_glue_export.h',
264 'webkitplatformsupport_impl.cc', 269 'webkitplatformsupport_impl.cc',
265 'webkitplatformsupport_impl.h', 270 'webkitplatformsupport_impl.h',
266 'webmenuitem.cc', 271 'webmenuitem.cc',
267 'webmenuitem.h', 272 'webmenuitem.h',
268 'webmenurunner_mac.h', 273 'webmenurunner_mac.h',
269 'webmenurunner_mac.mm', 274 'webmenurunner_mac.mm',
270 'webpreferences.cc',
271 'webpreferences.h',
272 'websocketstreamhandle_bridge.h', 275 'websocketstreamhandle_bridge.h',
273 'websocketstreamhandle_delegate.h', 276 'websocketstreamhandle_delegate.h',
274 'websocketstreamhandle_impl.cc', 277 'websocketstreamhandle_impl.cc',
275 'websocketstreamhandle_impl.h', 278 'websocketstreamhandle_impl.h',
276 'webthemeengine_impl_android.cc', 279 'webthemeengine_impl_android.cc',
277 'webthemeengine_impl_android.h', 280 'webthemeengine_impl_android.h',
278 'webthemeengine_impl_default.cc', 281 'webthemeengine_impl_default.cc',
279 'webthemeengine_impl_default.h', 282 'webthemeengine_impl_default.h',
280 'webthemeengine_impl_mac.cc', 283 'webthemeengine_impl_mac.cc',
281 'webthemeengine_impl_mac.h', 284 'webthemeengine_impl_mac.h',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 'variables': { 395 'variables': {
393 'jni_gen_package': 'webkit', 396 'jni_gen_package': 'webkit',
394 'input_java_class': 'android/widget/OverScroller.class', 397 'input_java_class': 'android/widget/OverScroller.class',
395 }, 398 },
396 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 399 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
397 }, 400 },
398 ], 401 ],
399 }], 402 }],
400 ], 403 ],
401 } 404 }
OLDNEW
« no previous file with comments | « webkit/common/webpreferences.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698