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

Side by Side Diff: content/content_common.gypi

Issue 6854027: Only add a WebKit dependency for shared library build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | « chrome_frame/chrome_frame.gyp ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'content_common', 8 'target_name': 'content_common',
9 'type': '<(library)', 9 'type': '<(library)',
10 'dependencies': [ 10 'dependencies': [
11 '../ipc/ipc.gyp:ipc', 11 '../ipc/ipc.gyp:ipc',
12 '../skia/skia.gyp:skia', 12 '../skia/skia.gyp:skia',
13 '../third_party/icu/icu.gyp:icuuc', 13 '../third_party/icu/icu.gyp:icuuc',
14 '../third_party/npapi/npapi.gyp:npapi', 14 '../third_party/npapi/npapi.gyp:npapi',
15 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
16 '../ui/gfx/gl/gl.gyp:gl', 15 '../ui/gfx/gl/gl.gyp:gl',
17 '../webkit/support/webkit_support.gyp:appcache', 16 '../webkit/support/webkit_support.gyp:appcache',
18 '../webkit/support/webkit_support.gyp:blob', 17 '../webkit/support/webkit_support.gyp:blob',
19 '../webkit/support/webkit_support.gyp:database', 18 '../webkit/support/webkit_support.gyp:database',
20 '../webkit/support/webkit_support.gyp:fileapi', 19 '../webkit/support/webkit_support.gyp:fileapi',
21 ], 20 ],
22 'include_dirs': [ 21 'include_dirs': [
23 '..', 22 '..',
24 ], 23 ],
25 'sources': [ 24 'sources': [
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'common/webblobregistry_impl.cc', 203 'common/webblobregistry_impl.cc',
205 'common/webblobregistry_impl.h', 204 'common/webblobregistry_impl.h',
206 'common/webblob_messages.h', 205 'common/webblob_messages.h',
207 'common/webmessageportchannel_impl.cc', 206 'common/webmessageportchannel_impl.cc',
208 'common/webmessageportchannel_impl.h', 207 'common/webmessageportchannel_impl.h',
209 'common/window_container_type.cc', 208 'common/window_container_type.cc',
210 'common/window_container_type.h', 209 'common/window_container_type.h',
211 'common/worker_messages.h', 210 'common/worker_messages.h',
212 ], 211 ],
213 'conditions': [ 212 'conditions': [
213 # If we add this dependency on Windows, then chrome_frame.dll gets
214 # bloated with a lot of WebKit code unnecessairly. So don't add a
215 # dependency for now, which is technically correct, but not necessary,
216 # until the code that's shared between common and chrome frame is split
217 # into a new target.
218 ['library=="shared_library"', {
219 'dependencies': [
220 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
221 ],
222 }],
214 ['OS=="win"', { 223 ['OS=="win"', {
215 'msvs_guid': '062E9260-304A-4657-A74C-0D3AA1A0A0A4', 224 'msvs_guid': '062E9260-304A-4657-A74C-0D3AA1A0A0A4',
216 'sources': [ 225 'sources': [
217 'common/gpu/media/mft_angle_video_device.cc', 226 'common/gpu/media/mft_angle_video_device.cc',
218 'common/gpu/media/mft_angle_video_device.h', 227 'common/gpu/media/mft_angle_video_device.h',
219 ], 228 ],
220 'include_dirs': [ 229 'include_dirs': [
221 '<(DEPTH)/third_party/angle/include', 230 '<(DEPTH)/third_party/angle/include',
222 '<(DEPTH)/third_party/angle/src', 231 '<(DEPTH)/third_party/angle/src',
223 '<(DEPTH)/third_party/wtl/include', 232 '<(DEPTH)/third_party/wtl/include',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 }], 265 }],
257 ['enable_gpu==1', { 266 ['enable_gpu==1', {
258 'dependencies': [ 267 'dependencies': [
259 '../gpu/gpu.gyp:command_buffer_service', 268 '../gpu/gpu.gyp:command_buffer_service',
260 ], 269 ],
261 }], 270 }],
262 ], 271 ],
263 }, 272 },
264 ], 273 ],
265 } 274 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698