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

Side by Side Diff: Source/web/web.gyp

Issue 54303004: Remove duplicated rule from web.gyp and enable chromium_code for all targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « no previous file | 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 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 28 matching lines...) Expand all
39 '../wtf/wtf.gypi', 39 '../wtf/wtf.gypi',
40 'web.gypi', 40 'web.gypi',
41 ], 41 ],
42 'targets': [ 42 'targets': [
43 { 43 {
44 'target_name': 'webkit', 44 'target_name': 'webkit',
45 'type': '<(component)', 45 'type': '<(component)',
46 'variables': { 'enable_wexit_time_destructors': 1, }, 46 'variables': { 'enable_wexit_time_destructors': 1, },
47 'dependencies': [ 47 'dependencies': [
48 'picker_resources', 48 'picker_resources',
49 '../config.gyp:config',
49 '../platform/blink_platform.gyp:blink_common', 50 '../platform/blink_platform.gyp:blink_common',
50 '../core/core.gyp:webcore', 51 '../core/core.gyp:webcore',
51 '../modules/modules.gyp:modules', 52 '../modules/modules.gyp:modules',
52 '<(DEPTH)/skia/skia.gyp:skia', 53 '<(DEPTH)/skia/skia.gyp:skia',
53 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator' , 54 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator' ,
54 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 55 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
55 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 56 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
56 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 57 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
57 ], 58 ],
58 'export_dependent_settings': [ 59 'export_dependent_settings': [
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 ], 208 ],
208 }], 209 }],
209 ['OS=="win"', { 210 ['OS=="win"', {
210 'include_dirs': [ 211 'include_dirs': [
211 '../../public/web/win', 212 '../../public/web/win',
212 ], 213 ],
213 }, { # else: OS!="win" 214 }, { # else: OS!="win"
214 'sources/': [ 215 'sources/': [
215 ['exclude', 'WebInputEventFactoryWin.cpp$'], 216 ['exclude', 'WebInputEventFactoryWin.cpp$'],
216 ], 217 ],
217 'variables': {
218 # FIXME: Turn on warnings on Windows.
219 'chromium_code': 1,
220 }
221 }], 218 }],
222 ['use_default_render_theme==1', { 219 ['use_default_render_theme==1', {
223 'include_dirs': [ 220 'include_dirs': [
224 '../../public/web/default', 221 '../../public/web/default',
225 ], 222 ],
226 }, { # else use_default_render_theme==0 223 }, { # else use_default_render_theme==0
227 'sources/': [ 224 'sources/': [
228 ['exclude', 'default/WebRenderTheme.cpp'], 225 ['exclude', 'default/WebRenderTheme.cpp'],
229 ], 226 ],
230 }], 227 }],
(...skipping 13 matching lines...) Expand all
244 ], 241 ],
245 }, 242 },
246 { 243 {
247 'target_name': 'webkit_test_support', 244 'target_name': 'webkit_test_support',
248 'conditions': [ 245 'conditions': [
249 ['component=="shared_library"', { 246 ['component=="shared_library"', {
250 'type': 'none', 247 'type': 'none',
251 }, { 248 }, {
252 'type': 'static_library', 249 'type': 'static_library',
253 'dependencies': [ 250 'dependencies': [
251 '../config.gyp:config',
254 '../core/core.gyp:webcore_test_support', 252 '../core/core.gyp:webcore_test_support',
255 '../modules/modules.gyp:modules_test_support', 253 '../modules/modules.gyp:modules_test_support',
256 '../wtf/wtf.gyp:wtf', 254 '../wtf/wtf.gyp:wtf',
257 '<(DEPTH)/skia/skia.gyp:skia', 255 '<(DEPTH)/skia/skia.gyp:skia',
258 ], 256 ],
259 'include_dirs': [ 257 'include_dirs': [
260 '../../public/web', 258 '../../public/web',
261 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. 259 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
262 '../../', 260 '../../',
263 ], 261 ],
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 ['clang==1', { 376 ['clang==1', {
379 'target_defaults': { 377 'target_defaults': {
380 'cflags': ['-Wglobal-constructors'], 378 'cflags': ['-Wglobal-constructors'],
381 'xcode_settings': { 379 'xcode_settings': {
382 'WARNING_CFLAGS': ['-Wglobal-constructors'], 380 'WARNING_CFLAGS': ['-Wglobal-constructors'],
383 }, 381 },
384 }, 382 },
385 }], 383 }],
386 ], # conditions 384 ], # conditions
387 } 385 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698