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

Side by Side Diff: webkit/common/webkit_common.gyp

Issue 189713002: Declare dependency on blink_headers in targets that use blink headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge of export_dependent_settings block in content_browser.gypi Created 6 years, 9 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
« components/nacl.gyp ('K') | « ppapi/ppapi_proxy_nacl.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 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': [
11 { 11 {
12 'target_name': 'webkit_common', 12 'target_name': 'webkit_common',
13 'type': '<(component)', 13 'type': '<(component)',
14 'defines': [ 14 'defines': [
15 'WEBKIT_COMMON_IMPLEMENTATION', 15 'WEBKIT_COMMON_IMPLEMENTATION',
16 ], 16 ],
17 'dependencies': [ 17 'dependencies': [
18 '<(DEPTH)/base/base.gyp:base', 18 '<(DEPTH)/base/base.gyp:base',
19 '<(DEPTH)/base/base.gyp:base_i18n', 19 '<(DEPTH)/base/base.gyp:base_i18n',
20 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 20 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
21 '<(DEPTH)/net/net.gyp:net', 21 '<(DEPTH)/net/net.gyp:net',
22 '<(DEPTH)/skia/skia.gyp:skia', 22 '<(DEPTH)/skia/skia.gyp:skia',
23 '<(DEPTH)/ui/base/ui_base.gyp:ui_base', 23 '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
24 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 24 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
25 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 25 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
26 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 26 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
27 '<(DEPTH)/url/url.gyp:url_lib', 27 '<(DEPTH)/url/url.gyp:url_lib',
28 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 28 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
29 '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
30 ],
31 'export_dependent_settings': [
32 '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
29 ], 33 ],
30 34
31 'include_dirs': [ 35 'include_dirs': [
32 '<(INTERMEDIATE_DIR)', 36 '<(INTERMEDIATE_DIR)',
33 '<(SHARED_INTERMEDIATE_DIR)/ui', 37 '<(SHARED_INTERMEDIATE_DIR)/ui',
34 '<(SHARED_INTERMEDIATE_DIR)/webkit', 38 '<(SHARED_INTERMEDIATE_DIR)/webkit',
35 ], 39 ],
36 40
37 'sources': [ 41 'sources': [
38 'cursors/webcursor.cc', 42 'cursors/webcursor.cc',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 }, 94 },
91 }], 95 }],
92 ['OS=="win"', { 96 ['OS=="win"', {
93 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 97 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
94 'msvs_disabled_warnings': [ 4800, 4267 ], 98 'msvs_disabled_warnings': [ 4800, 4267 ],
95 }], 99 }],
96 ], 100 ],
97 }, 101 },
98 ], 102 ],
99 } 103 }
OLDNEW
« components/nacl.gyp ('K') | « ppapi/ppapi_proxy_nacl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698