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

Side by Side Diff: chrome/chrome.gyp

Issue 397014: Revert 31875 to see whether it fixes reliability bot. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/spellcheck_host.cc ('k') | chrome/common/notification_type.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 2105 matching lines...) Expand 10 before | Expand all | Expand 10 after
2116 'browser/sessions/session_types.cc', 2116 'browser/sessions/session_types.cc',
2117 'browser/sessions/session_types.h', 2117 'browser/sessions/session_types.h',
2118 'browser/sessions/tab_restore_service.cc', 2118 'browser/sessions/tab_restore_service.cc',
2119 'browser/sessions/tab_restore_service.h', 2119 'browser/sessions/tab_restore_service.h',
2120 'browser/shell_dialogs.h', 2120 'browser/shell_dialogs.h',
2121 'browser/shell_integration.cc', 2121 'browser/shell_integration.cc',
2122 'browser/shell_integration.h', 2122 'browser/shell_integration.h',
2123 'browser/shell_integration_mac.mm', 2123 'browser/shell_integration_mac.mm',
2124 'browser/shell_integration_linux.cc', 2124 'browser/shell_integration_linux.cc',
2125 'browser/shell_integration_win.cc', 2125 'browser/shell_integration_win.cc',
2126 'browser/spellcheck_host.cc',
2127 'browser/spellcheck_host.h',
2128 'browser/spellcheck_worditerator.cc', 2126 'browser/spellcheck_worditerator.cc',
2129 'browser/spellcheck_worditerator.h', 2127 'browser/spellcheck_worditerator.h',
2130 'browser/spellchecker.cc', 2128 'browser/spellchecker.cc',
2131 'browser/spellchecker.h', 2129 'browser/spellchecker.h',
2132 'browser/spellchecker_common.h', 2130 'browser/spellchecker_common.h',
2133 'browser/spellchecker_linux.cc', 2131 'browser/spellchecker_linux.cc',
2134 'browser/spellchecker_mac.mm', 2132 'browser/spellchecker_mac.mm',
2135 'browser/spellchecker_platform_engine.h', 2133 'browser/spellchecker_platform_engine.h',
2136 'browser/spellchecker_win.cc', 2134 'browser/spellchecker_win.cc',
2137 'browser/ssl/ssl_blocking_page.cc', 2135 'browser/ssl/ssl_blocking_page.cc',
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2560 'browser/views/extensions/extension_shelf.h', 2558 'browser/views/extensions/extension_shelf.h',
2561 'browser/views/extensions/extension_view.cc', 2559 'browser/views/extensions/extension_view.cc',
2562 'browser/views/extensions/extension_view.h', 2560 'browser/views/extensions/extension_view.h',
2563 # Windows-specific files. 2561 # Windows-specific files.
2564 'browser/password_manager/password_store_win.cc', 2562 'browser/password_manager/password_store_win.cc',
2565 'browser/password_manager/password_store_win.h', 2563 'browser/password_manager/password_store_win.h',
2566 ], 2564 ],
2567 'sources': [ 2565 'sources': [
2568 'browser/crash_handler_host_linux.h', 2566 'browser/crash_handler_host_linux.h',
2569 'browser/net/ssl_config_service_manager_pref.cc', 2567 'browser/net/ssl_config_service_manager_pref.cc',
2568 'browser/spellcheck_host.cc',
2569 'browser/spellcheck_host.h',
2570 ], 2570 ],
2571 'sources/': [ 2571 'sources/': [
2572 # Exclude most of printing. 2572 # Exclude most of printing.
2573 ['exclude', '^browser/printing/'], 2573 ['exclude', '^browser/printing/'],
2574 ['include', '^browser/printing/page_(number|range|setup)\\.cc$'], 2574 ['include', '^browser/printing/page_(number|range|setup)\\.cc$'],
2575 ], 2575 ],
2576 'conditions': [ 2576 'conditions': [
2577 ['linux_breakpad==1', { 2577 ['linux_breakpad==1', {
2578 'sources': [ 2578 'sources': [
2579 'app/breakpad_linux.cc', 2579 'app/breakpad_linux.cc',
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
3370 'renderer/renderer_webkitclient_impl.cc', 3370 'renderer/renderer_webkitclient_impl.cc',
3371 'renderer/renderer_webkitclient_impl.h', 3371 'renderer/renderer_webkitclient_impl.h',
3372 'renderer/renderer_webstoragearea_impl.cc', 3372 'renderer/renderer_webstoragearea_impl.cc',
3373 'renderer/renderer_webstoragearea_impl.h', 3373 'renderer/renderer_webstoragearea_impl.h',
3374 'renderer/renderer_webstoragenamespace_impl.cc', 3374 'renderer/renderer_webstoragenamespace_impl.cc',
3375 'renderer/renderer_webstoragenamespace_impl.h', 3375 'renderer/renderer_webstoragenamespace_impl.h',
3376 'renderer/renderer_web_database_observer.cc', 3376 'renderer/renderer_web_database_observer.cc',
3377 'renderer/renderer_web_database_observer.h', 3377 'renderer/renderer_web_database_observer.h',
3378 'renderer/socket_stream_dispatcher.cc', 3378 'renderer/socket_stream_dispatcher.cc',
3379 'renderer/socket_stream_dispatcher.h', 3379 'renderer/socket_stream_dispatcher.h',
3380 'renderer/spellchecker/spellcheck.cc',
3381 'renderer/spellchecker/spellcheck.h',
3382 'renderer/spellchecker/spellcheck_worditerator.cc',
3383 'renderer/spellchecker/spellcheck_worditerator.h',
3384 'renderer/user_script_idle_scheduler.cc', 3380 'renderer/user_script_idle_scheduler.cc',
3385 'renderer/user_script_idle_scheduler.h', 3381 'renderer/user_script_idle_scheduler.h',
3386 'renderer/user_script_slave.cc', 3382 'renderer/user_script_slave.cc',
3387 'renderer/user_script_slave.h', 3383 'renderer/user_script_slave.h',
3388 'renderer/visitedlink_slave.cc', 3384 'renderer/visitedlink_slave.cc',
3389 'renderer/visitedlink_slave.h', 3385 'renderer/visitedlink_slave.h',
3390 'renderer/webplugin_delegate_proxy.cc', 3386 'renderer/webplugin_delegate_proxy.cc',
3391 'renderer/webplugin_delegate_proxy.h', 3387 'renderer/webplugin_delegate_proxy.h',
3392 'renderer/webplugin_delegate_pepper.cc', 3388 'renderer/webplugin_delegate_pepper.cc',
3393 'renderer/webplugin_delegate_pepper.h', 3389 'renderer/webplugin_delegate_pepper.h',
(...skipping 16 matching lines...) Expand all
3410 'dependencies': [ 3406 'dependencies': [
3411 'nacl', 3407 'nacl',
3412 ], 3408 ],
3413 }], 3409 }],
3414 # Linux-specific rules. 3410 # Linux-specific rules.
3415 ['OS=="linux"', { 3411 ['OS=="linux"', {
3416 'dependencies': [ 3412 'dependencies': [
3417 '../build/linux/system.gyp:gtk', 3413 '../build/linux/system.gyp:gtk',
3418 '../sandbox/sandbox.gyp:sandbox', 3414 '../sandbox/sandbox.gyp:sandbox',
3419 ], 3415 ],
3416 'sources': [
3417 'renderer/spellchecker/spellcheck.cc',
3418 'renderer/spellchecker/spellcheck.h',
3419 'renderer/spellchecker/spellcheck_worditerator.cc',
3420 'renderer/spellchecker/spellcheck_worditerator.h',
3421 ],
3420 }], 3422 }],
3421 # Windows-specific rules. 3423 # Windows-specific rules.
3422 ['OS=="win"', { 3424 ['OS=="win"', {
3423 'include_dirs': [ 3425 'include_dirs': [
3424 'third_party/wtl/include', 3426 'third_party/wtl/include',
3425 ], 3427 ],
3426 'dependencies': [ 3428 'dependencies': [
3427 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', 3429 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
3428 ], 3430 ],
3429 'export_dependent_settings': [ 3431 'export_dependent_settings': [
3430 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', 3432 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
3431 ], 3433 ],
3432 },], 3434 },],
3433 # Mac-specific rules.
3434 ['OS=="mac"', {
3435 'sources!': [
3436 'renderer/spellchecker/spellcheck.cc',
3437 'renderer/spellchecker/spellcheck.h',
3438 'renderer/spellchecker/spellcheck_worditerator.cc',
3439 'renderer/spellchecker/spellcheck_worditerator.h',
3440 ],
3441 },],
3442 ], 3435 ],
3443 }, 3436 },
3444 { 3437 {
3445 'target_name': 'utility', 3438 'target_name': 'utility',
3446 'type': '<(library)', 3439 'type': '<(library)',
3447 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', 3440 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
3448 'dependencies': [ 3441 'dependencies': [
3449 '../base/base.gyp:base', 3442 '../base/base.gyp:base',
3450 '../skia/skia.gyp:skia', 3443 '../skia/skia.gyp:skia',
3451 ], 3444 ],
(...skipping 3607 matching lines...) Expand 10 before | Expand all | Expand 10 after
7059 ] 7052 ]
7060 }], 7053 }],
7061 ], # 'conditions' 7054 ], # 'conditions'
7062 } 7055 }
7063 7056
7064 # Local Variables: 7057 # Local Variables:
7065 # tab-width:2 7058 # tab-width:2
7066 # indent-tabs-mode:nil 7059 # indent-tabs-mode:nil
7067 # End: 7060 # End:
7068 # vim: set expandtab tabstop=2 shiftwidth=2: 7061 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/spellcheck_host.cc ('k') | chrome/common/notification_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698