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

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

Issue 20003004: reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & allocator dep for components_unittests in shared_library2 Created 7 years, 5 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/glue/webkit_glue.cc ('k') | webkit/glue/webkit_glue_common.gyp » ('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'],
11 }, 11 },
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'glue_child', 14 'target_name': 'glue_child',
15 'type': '<(component)', 15 'type': '<(component)',
16 'variables': { 'enable_wexit_time_destructors': 1, }, 16 'variables': { 'enable_wexit_time_destructors': 1, },
17 'defines': [ 17 'defines': [
18 'WEBKIT_CHILD_IMPLEMENTATION', 18 'WEBKIT_CHILD_IMPLEMENTATION',
19 ], 19 ],
20 'dependencies': [ 20 'dependencies': [
21 '<(DEPTH)/base/base.gyp:base', 21 '<(DEPTH)/base/base.gyp:base',
22 '<(DEPTH)/base/base.gyp:base_i18n',
23 '<(DEPTH)/base/base.gyp:base_static',
22 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 24 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
25 '<(DEPTH)/net/net.gyp:net',
23 '<(DEPTH)/skia/skia.gyp:skia', 26 '<(DEPTH)/skia/skia.gyp:skia',
24 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 27 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
25 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', 28 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
26 '<(DEPTH)/ui/ui.gyp:ui', 29 '<(DEPTH)/ui/ui.gyp:ui',
27 30 '<(DEPTH)/url/url.gyp:url_lib',
28 # TODO(scottmg): crbug.com/237249 31 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
29 'glue', 32 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
33 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
34 '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
30 ], 35 ],
31 36
32 'include_dirs': [ 37 'include_dirs': [
33 # For JNI generated header. 38 # For JNI generated header.
34 '<(SHARED_INTERMEDIATE_DIR)/webkit', 39 '<(SHARED_INTERMEDIATE_DIR)/webkit',
35 ], 40 ],
41 'hard_dependency': 1,
36 42
37 'sources': [ 43 'sources': [
38 '../child/fling_animator_impl_android.cc', 44 '../child/fling_animator_impl_android.cc',
39 '../child/fling_animator_impl_android.h', 45 '../child/fling_animator_impl_android.h',
40 '../child/fling_curve_configuration.cc', 46 '../child/fling_curve_configuration.cc',
41 '../child/fling_curve_configuration.h', 47 '../child/fling_curve_configuration.h',
48 '../child/ftp_directory_listing_response_delegate.cc',
49 '../child/ftp_directory_listing_response_delegate.h',
50 '../child/multipart_response_delegate.cc',
51 '../child/multipart_response_delegate.h',
52 '../child/resource_loader_bridge.cc',
53 '../child/resource_loader_bridge.h',
42 '../child/touch_fling_gesture_curve.cc', 54 '../child/touch_fling_gesture_curve.cc',
43 '../child/touch_fling_gesture_curve.h', 55 '../child/touch_fling_gesture_curve.h',
44 '../child/web_discardable_memory_impl.cc', 56 '../child/web_discardable_memory_impl.cc',
45 '../child/web_discardable_memory_impl.h', 57 '../child/web_discardable_memory_impl.h',
46 '../child/webfallbackthemeengine_impl.cc', 58 '../child/webfallbackthemeengine_impl.cc',
47 '../child/webfallbackthemeengine_impl.h', 59 '../child/webfallbackthemeengine_impl.h',
48 '../child/webkit_child_export.h', 60 '../child/webkit_child_export.h',
61 '../child/webkit_child_helpers.cc',
62 '../child/webkit_child_helpers.h',
49 '../child/webkitplatformsupport_child_impl.cc', 63 '../child/webkitplatformsupport_child_impl.cc',
50 '../child/webkitplatformsupport_child_impl.h', 64 '../child/webkitplatformsupport_child_impl.h',
65 '../child/webkitplatformsupport_impl.cc',
66 '../child/webkitplatformsupport_impl.h',
67 '../child/websocketstreamhandle_delegate.h',
68 '../child/websocketstreamhandle_impl.cc',
69 '../child/websocketstreamhandle_impl.h',
51 '../child/webthemeengine_impl_android.cc', 70 '../child/webthemeengine_impl_android.cc',
52 '../child/webthemeengine_impl_android.h', 71 '../child/webthemeengine_impl_android.h',
53 '../child/webthemeengine_impl_default.cc', 72 '../child/webthemeengine_impl_default.cc',
54 '../child/webthemeengine_impl_default.h', 73 '../child/webthemeengine_impl_default.h',
55 '../child/webthemeengine_impl_mac.cc', 74 '../child/webthemeengine_impl_mac.cc',
56 '../child/webthemeengine_impl_mac.h', 75 '../child/webthemeengine_impl_mac.h',
57 '../child/webthemeengine_impl_win.cc', 76 '../child/webthemeengine_impl_win.cc',
58 '../child/webthemeengine_impl_win.h', 77 '../child/webthemeengine_impl_win.h',
59 '../child/webthread_impl.cc', 78 '../child/webthread_impl.cc',
60 '../child/webthread_impl.h', 79 '../child/webthread_impl.h',
80 '../child/weburlloader_impl.cc',
81 '../child/weburlloader_impl.h',
82 '../child/weburlrequest_extradata_impl.cc',
83 '../child/weburlrequest_extradata_impl.h',
84 '../child/weburlresponse_extradata_impl.cc',
85 '../child/weburlresponse_extradata_impl.h',
61 '../child/worker_task_runner.cc', 86 '../child/worker_task_runner.cc',
62 '../child/worker_task_runner.h', 87 '../child/worker_task_runner.h',
63 ], 88 ],
64 89
90 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
91 'msvs_disabled_warnings': [ 4267 ],
92
65 'conditions': [ 93 'conditions': [
66 ['use_default_render_theme==0', { 94 ['use_default_render_theme==0', {
67 'sources/': [ 95 'sources/': [
68 ['exclude', 'webthemeengine_impl_default.cc'], 96 ['exclude', 'webthemeengine_impl_default.cc'],
69 ['exclude', 'webthemeengine_impl_default.h'], 97 ['exclude', 'webthemeengine_impl_default.h'],
70 ], 98 ],
71 }], 99 }],
72 ['OS=="mac"', { 100 ['OS=="mac"', {
73 'link_settings': { 101 'link_settings': {
74 'libraries': [ 102 'libraries': [
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 150 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
123 'plugins', 151 'plugins',
124 'webkit_media', 152 'webkit_media',
125 ], 153 ],
126 'include_dirs': [ 154 'include_dirs': [
127 '<(INTERMEDIATE_DIR)', 155 '<(INTERMEDIATE_DIR)',
128 '<(SHARED_INTERMEDIATE_DIR)/webkit', 156 '<(SHARED_INTERMEDIATE_DIR)/webkit',
129 '<(SHARED_INTERMEDIATE_DIR)/ui', 157 '<(SHARED_INTERMEDIATE_DIR)/ui',
130 ], 158 ],
131 'sources': [ 159 'sources': [
132 'ftp_directory_listing_response_delegate.cc',
133 'ftp_directory_listing_response_delegate.h',
134 'network_list_observer.h', 160 'network_list_observer.h',
135 'resource_loader_bridge.cc',
136 'resource_loader_bridge.h',
137 'resource_type.cc',
138 'resource_type.h',
139 'simple_webmimeregistry_impl.cc', 161 'simple_webmimeregistry_impl.cc',
140 'simple_webmimeregistry_impl.h', 162 'simple_webmimeregistry_impl.h',
141 'webfileutilities_impl.cc', 163 'webfileutilities_impl.cc',
142 'webfileutilities_impl.h', 164 'webfileutilities_impl.h',
143 'webkit_glue.cc', 165 'webkit_glue.cc',
144 'webkit_glue.h', 166 'webkit_glue.h',
145 'webkit_glue_export.h', 167 'webkit_glue_export.h',
146 'webkitplatformsupport_impl.cc',
147 'webkitplatformsupport_impl.h',
148 'websocketstreamhandle_bridge.h', 168 'websocketstreamhandle_bridge.h',
149 'websocketstreamhandle_delegate.h',
150 'websocketstreamhandle_impl.cc',
151 'websocketstreamhandle_impl.h',
152 'weburlloader_impl.cc',
153 'weburlloader_impl.h',
154 ], 169 ],
155 # When glue is a dependency, it needs to be a hard dependency. 170 # When glue is a dependency, it needs to be a hard dependency.
156 # Dependents may rely on files generated by this target or one of its 171 # Dependents may rely on files generated by this target or one of its
157 # own hard dependencies. 172 # own hard dependencies.
158 'hard_dependency': 1, 173 'hard_dependency': 1,
159 'conditions': [ 174 'conditions': [
160 ['toolkit_uses_gtk == 1', { 175 ['toolkit_uses_gtk == 1', {
161 'dependencies': [ 176 'dependencies': [
162 '<(DEPTH)/build/linux/system.gyp:gtk', 177 '<(DEPTH)/build/linux/system.gyp:gtk',
163 ], 178 ],
(...skipping 15 matching lines...) Expand all
179 'dependencies': [ 194 'dependencies': [
180 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 195 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
181 ], 196 ],
182 'export_dependent_settings': [ 197 'export_dependent_settings': [
183 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 198 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
184 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 199 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
185 ], 200 ],
186 }], 201 }],
187 ], 202 ],
188 }], 203 }],
204 ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1' , {
205 'dependencies': [
206 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
207 ],
208 }],
189 ], 209 ],
190 }, 210 },
191 ], 211 ],
192 'conditions': [ 212 'conditions': [
193 ['use_third_party_translations==1', { 213 ['use_third_party_translations==1', {
194 'targets': [ 214 'targets': [
195 { 215 {
196 'target_name': 'inspector_strings', 216 'target_name': 'inspector_strings',
197 'type': 'none', 217 'type': 'none',
198 'variables': { 218 'variables': {
(...skipping 20 matching lines...) Expand all
219 'variables': { 239 'variables': {
220 'jni_gen_package': 'webkit', 240 'jni_gen_package': 'webkit',
221 'input_java_class': 'android/widget/OverScroller.class', 241 'input_java_class': 'android/widget/OverScroller.class',
222 }, 242 },
223 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 243 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
224 }, 244 },
225 ], 245 ],
226 }], 246 }],
227 ], 247 ],
228 } 248 }
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/glue/webkit_glue_common.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698