Chromium Code Reviews

Side by Side Diff: chrome/chrome.gyp

Issue 118047: Reverting 17273 - Fails reliability tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/test/testing_profile.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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 1073 matching lines...)
1084 'browser/page_state.cc', 1084 'browser/page_state.cc',
1085 'browser/page_state.h', 1085 'browser/page_state.h',
1086 'browser/password_manager/encryptor_linux.cc', 1086 'browser/password_manager/encryptor_linux.cc',
1087 'browser/password_manager/encryptor_mac.mm', 1087 'browser/password_manager/encryptor_mac.mm',
1088 'browser/password_manager/encryptor_win.cc', 1088 'browser/password_manager/encryptor_win.cc',
1089 'browser/password_manager/encryptor.h', 1089 'browser/password_manager/encryptor.h',
1090 'browser/password_manager/ie7_password.cc', 1090 'browser/password_manager/ie7_password.cc',
1091 'browser/password_manager/ie7_password.h', 1091 'browser/password_manager/ie7_password.h',
1092 'browser/password_manager/password_form_manager.cc', 1092 'browser/password_manager/password_form_manager.cc',
1093 'browser/password_manager/password_form_manager.h', 1093 'browser/password_manager/password_form_manager.h',
1094 'browser/password_manager/password_form_manager_win.cc',
1094 'browser/password_manager/password_manager.cc', 1095 'browser/password_manager/password_manager.cc',
1095 'browser/password_manager/password_manager.h', 1096 'browser/password_manager/password_manager.h',
1096 'browser/password_manager/password_store.cc',
1097 'browser/password_manager/password_store.h',
1098 'browser/password_manager/password_store_default.cc',
1099 'browser/password_manager/password_store_default.h',
1100 # Temporarily disabled while we figure some stuff out.
1101 # http://code.google.com/p/chromium/issues/detail?id=12351
1102 # 'browser/password_manager/password_store_gnome.h',
1103 # 'browser/password_manager/password_store_gnome.cc',
1104 # 'browser/password_manager/password_store_kwallet.h',
1105 # 'browser/password_manager/password_store_kwallet.cc',
1106 'browser/password_manager/password_store_mac_internal.h',
1107 'browser/password_manager/password_store_mac.h',
1108 'browser/password_manager/password_store_mac.cc',
1109 'browser/password_manager/password_store_win.h',
1110 'browser/password_manager/password_store_win.cc',
1111 'browser/plugin_installer.cc', 1097 'browser/plugin_installer.cc',
1112 'browser/plugin_installer.h', 1098 'browser/plugin_installer.h',
1113 'browser/plugin_process_host.cc', 1099 'browser/plugin_process_host.cc',
1114 'browser/plugin_process_host.h', 1100 'browser/plugin_process_host.h',
1115 'browser/plugin_service.cc', 1101 'browser/plugin_service.cc',
1116 'browser/plugin_service.h', 1102 'browser/plugin_service.h',
1117 'browser/printing/page_number.cc', 1103 'browser/printing/page_number.cc',
1118 'browser/printing/page_number.h', 1104 'browser/printing/page_number.h',
1119 'browser/printing/page_overlays.cc', 1105 'browser/printing/page_overlays.cc',
1120 'browser/printing/page_overlays.h', 1106 'browser/printing/page_overlays.h',
(...skipping 439 matching lines...)
1560 '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc', 1546 '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
1561 ], 1547 ],
1562 'conditions': [ 1548 'conditions': [
1563 ['javascript_engine=="v8"', { 1549 ['javascript_engine=="v8"', {
1564 'defines': [ 1550 'defines': [
1565 'CHROME_V8', 1551 'CHROME_V8',
1566 ], 1552 ],
1567 }], 1553 }],
1568 ['OS=="linux"', { 1554 ['OS=="linux"', {
1569 'dependencies': [ 1555 'dependencies': [
1570 # Temporarily disabled while we figure some stuff out.
1571 # http://code.google.com/p/chromium/issues/detail?id=12351
1572 # '../build/linux/system.gyp:dbus-glib',
1573 # '../build/linux/system.gyp:gnome-keyring',
1574 '../build/linux/system.gyp:gtk', 1556 '../build/linux/system.gyp:gtk',
1575 ], 1557 ],
1576 'sources!': [ 1558 'sources!': [
1577 'browser/extensions/extension_shelf.cc', 1559 'browser/extensions/extension_shelf.cc',
1578 'browser/extensions/extension_shelf.h', 1560 'browser/extensions/extension_shelf.h',
1579 'browser/extensions/extension_view.cc', 1561 'browser/extensions/extension_view.cc',
1580 'browser/extensions/extension_view.h', 1562 'browser/extensions/extension_view.h',
1581 # Windows-specific files. 1563 # Windows-specific files.
1582 'browser/password_manager/password_store_win.cc',
1583 'browser/password_manager/password_store_win.h',
1584 ], 1564 ],
1585 'conditions': [ 1565 'conditions': [
1586 ['linux_breakpad==1', { 1566 ['linux_breakpad==1', {
1587 'sources': [ 1567 'sources': [
1588 'browser/renderer_host/render_crash_handler_host_linux.cc', 1568 'browser/renderer_host/render_crash_handler_host_linux.cc',
1589 'app/breakpad_linux.cc', 1569 'app/breakpad_linux.cc',
1590 'app/breakpad_linux.h', 1570 'app/breakpad_linux.h',
1591 ], 1571 ],
1592 'dependencies': [ 1572 'dependencies': [
1593 '../breakpad/breakpad.gyp:breakpad_client', 1573 '../breakpad/breakpad.gyp:breakpad_client',
(...skipping 22 matching lines...)
1616 ['exclude', '^browser/download/'], 1596 ['exclude', '^browser/download/'],
1617 ['include', '^browser/download/download_(file|manager|shelf)\\.cc$'] , 1597 ['include', '^browser/download/download_(file|manager|shelf)\\.cc$'] ,
1618 ['include', '^browser/download/download_request_manager\\.cc$'], 1598 ['include', '^browser/download/download_request_manager\\.cc$'],
1619 ['include', '^browser/download/download_item_model\\.cc$'], 1599 ['include', '^browser/download/download_item_model\\.cc$'],
1620 ['include', '^browser/download/save_(file(_manager)?|item|package)\\ .cc$'], 1600 ['include', '^browser/download/save_(file(_manager)?|item|package)\\ .cc$'],
1621 ], 1601 ],
1622 'sources!': [ 1602 'sources!': [
1623 'browser/automation/automation_provider_list_generic.cc', 1603 'browser/automation/automation_provider_list_generic.cc',
1624 'browser/bookmarks/bookmark_context_menu.cc', 1604 'browser/bookmarks/bookmark_context_menu.cc',
1625 'browser/bookmarks/bookmark_drop_info.cc', 1605 'browser/bookmarks/bookmark_drop_info.cc',
1626 'browser/password_manager/password_store_gnome.h',
1627 'browser/password_manager/password_store_gnome.cc',
1628 'browser/password_manager/password_store_kwallet.h',
1629 'browser/password_manager/password_store_kwallet.cc',
1630 'browser/password_manager/password_store_win.cc',
1631 'browser/password_manager/password_store_win.h',
1632 'browser/extensions/extension_shelf.cc', 1606 'browser/extensions/extension_shelf.cc',
1633 'browser/extensions/extension_shelf.h', 1607 'browser/extensions/extension_shelf.h',
1634 'browser/extensions/extension_view.cc', 1608 'browser/extensions/extension_view.cc',
1635 'browser/extensions/extension_view.h', 1609 'browser/extensions/extension_view.h',
1636 ], 1610 ],
1637 'sources': [ 1611 'sources': [
1638 # Build the necessary GTM sources 1612 # Build the necessary GTM sources
1639 '../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.m', 1613 '../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.m',
1640 '../third_party/GTM/AppKit/GTMNSColor+Luminance.m', 1614 '../third_party/GTM/AppKit/GTMNSColor+Luminance.m',
1641 '../third_party/GTM/AppKit/GTMTheme.m', 1615 '../third_party/GTM/AppKit/GTMTheme.m',
(...skipping 31 matching lines...)
1673 ], 1647 ],
1674 'export_dependent_settings': [ 1648 'export_dependent_settings': [
1675 '../views/views.gyp:views', 1649 '../views/views.gyp:views',
1676 ], 1650 ],
1677 'sources': [ 1651 'sources': [
1678 # Using built-in rule in vstudio for midl. 1652 # Using built-in rule in vstudio for midl.
1679 'browser/history/history_indexer.idl', 1653 'browser/history/history_indexer.idl',
1680 ], 1654 ],
1681 'sources!': [ 1655 'sources!': [
1682 'browser/history/history_publisher_none.cc', 1656 'browser/history/history_publisher_none.cc',
1683 'browser/password_manager/password_store_gnome.h',
1684 'browser/password_manager/password_store_gnome.cc',
1685 'browser/password_manager/password_store_kwallet.h',
1686 'browser/password_manager/password_store_kwallet.cc',
1687 ], 1657 ],
1688 'configurations': { 1658 'configurations': {
1689 'Debug': { 1659 'Debug': {
1690 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', 1660 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
1691 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', 1661 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
1692 }, 1662 },
1693 }, 1663 },
1694 }, { # 'OS!="win" 1664 }, { # 'OS!="win"
1695 'sources/': [ 1665 'sources/': [
1696 # Exclude all of hang_monitor. 1666 # Exclude all of hang_monitor.
(...skipping 1435 matching lines...)
3132 'browser/net/chrome_url_request_context_unittest.cc', 3102 'browser/net/chrome_url_request_context_unittest.cc',
3133 'browser/net/dns_host_info_unittest.cc', 3103 'browser/net/dns_host_info_unittest.cc',
3134 'browser/net/dns_master_unittest.cc', 3104 'browser/net/dns_master_unittest.cc',
3135 'browser/net/resolve_proxy_msg_helper_unittest.cc', 3105 'browser/net/resolve_proxy_msg_helper_unittest.cc',
3136 'browser/net/test_url_fetcher_factory.cc', 3106 'browser/net/test_url_fetcher_factory.cc',
3137 'browser/net/test_url_fetcher_factory.h', 3107 'browser/net/test_url_fetcher_factory.h',
3138 'browser/net/url_fetcher_unittest.cc', 3108 'browser/net/url_fetcher_unittest.cc',
3139 'browser/net/url_fixer_upper_unittest.cc', 3109 'browser/net/url_fixer_upper_unittest.cc',
3140 'browser/password_manager/encryptor_unittest.cc', 3110 'browser/password_manager/encryptor_unittest.cc',
3141 'browser/password_manager/password_form_manager_unittest.cc', 3111 'browser/password_manager/password_form_manager_unittest.cc',
3142 'browser/password_manager/password_store_mac_unittest.cc',
3143 'browser/printing/page_number_unittest.cc', 3112 'browser/printing/page_number_unittest.cc',
3144 'browser/printing/page_overlays_unittest.cc', 3113 'browser/printing/page_overlays_unittest.cc',
3145 'browser/printing/page_range_unittest.cc', 3114 'browser/printing/page_range_unittest.cc',
3146 'browser/printing/page_setup_unittest.cc', 3115 'browser/printing/page_setup_unittest.cc',
3147 'browser/printing/print_job_unittest.cc', 3116 'browser/printing/print_job_unittest.cc',
3148 'browser/printing/win_printing_context_unittest.cc', 3117 'browser/printing/win_printing_context_unittest.cc',
3149 'browser/profile_manager_unittest.cc', 3118 'browser/profile_manager_unittest.cc',
3150 'browser/renderer_host/audio_renderer_host_unittest.cc', 3119 'browser/renderer_host/audio_renderer_host_unittest.cc',
3151 'browser/renderer_host/render_view_host_unittest.cc', 3120 'browser/renderer_host/render_view_host_unittest.cc',
3152 'browser/renderer_host/render_widget_host_unittest.cc', 3121 'browser/renderer_host/render_widget_host_unittest.cc',
(...skipping 1122 matching lines...)
4275 # Use outputs of this action as inputs for the main target build. 4244 # Use outputs of this action as inputs for the main target build.
4276 # Seems as a misnomer but makes this happy on Linux (scons). 4245 # Seems as a misnomer but makes this happy on Linux (scons).
4277 'process_outputs_as_sources': 1, 4246 'process_outputs_as_sources': 1,
4278 }, 4247 },
4279 ], # 'actions' 4248 ], # 'actions'
4280 }, 4249 },
4281 ] 4250 ]
4282 }], 4251 }],
4283 ], # 'conditions' 4252 ], # 'conditions'
4284 } 4253 }
OLDNEW
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/test/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine