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: trunk/src/content/content_shell.gypi

Issue 213033002: Revert 259580 "Move wm/public into wm target" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/content/content_browser.gypi ('k') | trunk/src/content/content_tests.gypi » ('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 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 318 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
319 ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_alloc ator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tc malloc==1))) or (android_use_tcmalloc==1)', { 319 ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_alloc ator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tc malloc==1))) or (android_use_tcmalloc==1)', {
320 'dependencies': [ 320 'dependencies': [
321 # This is needed by content/app/content_main_runner.cc 321 # This is needed by content/app/content_main_runner.cc
322 '../base/allocator/allocator.gyp:allocator', 322 '../base/allocator/allocator.gyp:allocator',
323 ], 323 ],
324 }], 324 }],
325 ['use_aura==1', { 325 ['use_aura==1', {
326 'dependencies': [ 326 'dependencies': [
327 '../ui/aura/aura.gyp:aura', 327 '../ui/aura/aura.gyp:aura',
328 '../ui/wm/wm.gyp:wm',
329 '../ui/base/strings/ui_strings.gyp:ui_strings', 328 '../ui/base/strings/ui_strings.gyp:ui_strings',
330 ], 329 ],
331 'sources/': [ 330 'sources/': [
332 ['exclude', 'shell/browser/shell_gtk.cc'], 331 ['exclude', 'shell/browser/shell_gtk.cc'],
333 ], 332 ],
334 'conditions': [ 333 'conditions': [
335 ['toolkit_views==1', { 334 ['toolkit_views==1', {
336 'dependencies': [ 335 'dependencies': [
337 '../ui/resources/ui_resources.gyp:ui_resources', 336 '../ui/resources/ui_resources.gyp:ui_resources',
338 '../ui/views/controls/webview/webview.gyp:webview', 337 '../ui/views/controls/webview/webview.gyp:webview',
339 '../ui/views/views.gyp:views', 338 '../ui/views/views.gyp:views',
340 '../ui/views/views.gyp:views_test_support', 339 '../ui/views/views.gyp:views_test_support',
341 '../ui/wm/wm.gyp:wm', 340 '../ui/wm/wm.gyp:wm_core',
342 ], 341 ],
343 'sources/': [ 342 'sources/': [
344 ['exclude', 'shell/browser/shell_aura.cc'], 343 ['exclude', 'shell/browser/shell_aura.cc'],
345 ], 344 ],
346 }, { 345 }, {
347 'sources/': [ 346 'sources/': [
348 ['exclude', 'shell/browser/shell_views.cc'], 347 ['exclude', 'shell/browser/shell_views.cc'],
349 ], 348 ],
350 }], 349 }],
351 ], 350 ],
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1137 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1139 '--destination_dir', '<(dest_dir)', 1138 '--destination_dir', '<(dest_dir)',
1140 ], 1139 ],
1141 }, 1140 },
1142 ], 1141 ],
1143 }, 1142 },
1144 ], 1143 ],
1145 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1144 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1146 ] 1145 ]
1147 } 1146 }
OLDNEW
« no previous file with comments | « trunk/src/content/content_browser.gypi ('k') | trunk/src/content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698