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

Side by Side Diff: chrome/chrome.gyp

Issue 261042: Remove pthreads from build and installer files. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « chrome/browser/sync/util/pthread_helpers_fwd.h ('k') | chrome/common/chrome_switches.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 4638 matching lines...) Expand 10 before | Expand all | Expand 10 after
4649 '../build/temp_gyp/googleurl.gyp:googleurl', 4649 '../build/temp_gyp/googleurl.gyp:googleurl',
4650 '../net/net.gyp:net', 4650 '../net/net.gyp:net',
4651 '../third_party/icu/icu.gyp:icuuc', 4651 '../third_party/icu/icu.gyp:icuuc',
4652 '../third_party/libjingle/libjingle.gyp:libjingle', 4652 '../third_party/libjingle/libjingle.gyp:libjingle',
4653 '../third_party/sqlite/sqlite.gyp:sqlite', 4653 '../third_party/sqlite/sqlite.gyp:sqlite',
4654 'common', 4654 'common',
4655 'notifier', 4655 'notifier',
4656 'sync', 4656 'sync',
4657 'sync_proto', 4657 'sync_proto',
4658 ], 4658 ],
4659 'conditions': [
4660 ['OS=="win"', {
4661 'dependencies': [
4662 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
4663 ],
4664 }],
4665 ],
4666 }], 4659 }],
4667 ], 4660 ],
4668 }, 4661 },
4669 { 4662 {
4670 'target_name': 'page_cycler_tests', 4663 'target_name': 'page_cycler_tests',
4671 'type': 'executable', 4664 'type': 'executable',
4672 'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7', 4665 'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7',
4673 'dependencies': [ 4666 'dependencies': [
4674 'chrome', 4667 'chrome',
4675 'chrome_resources', 4668 'chrome_resources',
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
4870 'wininet.dll', 4863 'wininet.dll',
4871 'wsock32.dll', 4864 'wsock32.dll',
4872 'ws2_32.dll', 4865 'ws2_32.dll',
4873 'winspool.drv', 4866 'winspool.drv',
4874 'comdlg32.dll', 4867 'comdlg32.dll',
4875 'imagehlp.dll', 4868 'imagehlp.dll',
4876 'psapi.dll', 4869 'psapi.dll',
4877 'urlmon.dll', 4870 'urlmon.dll',
4878 'imm32.dll', 4871 'imm32.dll',
4879 'iphlpapi.dll', 4872 'iphlpapi.dll',
4880 'pthreads.dll',
4881 ], 4873 ],
4882 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', 4874 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
4883 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', 4875 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
4884 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency). 4876 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
4885 'SubSystem': '2', 4877 'SubSystem': '2',
4886 }, 4878 },
4887 'VCManifestTool': { 4879 'VCManifestTool': {
4888 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man ifest', 4880 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man ifest',
4889 }, 4881 },
4890 }, 4882 },
(...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after
6658 '_CRT_SECURE_NO_WARNINGS', 6650 '_CRT_SECURE_NO_WARNINGS',
6659 '_USE_32BIT_TIME_T', 6651 '_USE_32BIT_TIME_T',
6660 'kXmppProductName="chromium-sync"', 6652 'kXmppProductName="chromium-sync"',
6661 ], 6653 ],
6662 'dependencies': [ 6654 'dependencies': [
6663 '../third_party/expat/expat.gyp:expat', 6655 '../third_party/expat/expat.gyp:expat',
6664 '../third_party/libjingle/libjingle.gyp:libjingle', 6656 '../third_party/libjingle/libjingle.gyp:libjingle',
6665 'sync_proto', 6657 'sync_proto',
6666 ], 6658 ],
6667 'conditions': [ 6659 'conditions': [
6668 ['OS=="win"', {
6669 'dependencies': [
6670 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
6671 ],
6672 }],
6673 ['OS=="linux"', { 6660 ['OS=="linux"', {
6674 'defines': [ 6661 'defines': [
6675 'POSIX', 6662 'POSIX',
6676 'OS_LINUX', 6663 'OS_LINUX',
6677 ], 6664 ],
6678 }], 6665 }],
6679 ], 6666 ],
6680 }, 6667 },
6681 { 6668 {
6682 'target_name': 'sync_unit_tests', 6669 'target_name': 'sync_unit_tests',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
6723 '../testing/gtest.gyp:gtest', 6710 '../testing/gtest.gyp:gtest',
6724 '../third_party/libjingle/libjingle.gyp:libjingle', 6711 '../third_party/libjingle/libjingle.gyp:libjingle',
6725 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', 6712 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
6726 'notifier', 6713 'notifier',
6727 'sync', 6714 'sync',
6728 'sync_proto', 6715 'sync_proto',
6729 'test_support_unit', 6716 'test_support_unit',
6730 ], 6717 ],
6731 'conditions': [ 6718 'conditions': [
6732 ['OS=="win"', { 6719 ['OS=="win"', {
6733 'dependencies': [
6734 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
6735 ],
6736 'link_settings': { 6720 'link_settings': {
6737 'libraries': [ 6721 'libraries': [
6738 '-lcrypt32.lib', 6722 '-lcrypt32.lib',
6739 '-lws2_32.lib', 6723 '-lws2_32.lib',
6740 '-lsecur32.lib', 6724 '-lsecur32.lib',
6741 ], 6725 ],
6742 }, 6726 },
6743 }], 6727 }],
6744 ['OS=="linux"', { 6728 ['OS=="linux"', {
6745 'defines': [ 6729 'defines': [
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
6809 'browser/sync/engine/syncer_end_command.h', 6793 'browser/sync/engine/syncer_end_command.h',
6810 'browser/sync/engine/syncer_proto_util.cc', 6794 'browser/sync/engine/syncer_proto_util.cc',
6811 'browser/sync/engine/syncer_proto_util.h', 6795 'browser/sync/engine/syncer_proto_util.h',
6812 'browser/sync/engine/syncer_session.h', 6796 'browser/sync/engine/syncer_session.h',
6813 'browser/sync/engine/syncer_status.cc', 6797 'browser/sync/engine/syncer_status.cc',
6814 'browser/sync/engine/syncer_status.h', 6798 'browser/sync/engine/syncer_status.h',
6815 'browser/sync/engine/syncer_thread.cc', 6799 'browser/sync/engine/syncer_thread.cc',
6816 'browser/sync/engine/syncer_thread.h', 6800 'browser/sync/engine/syncer_thread.h',
6817 'browser/sync/engine/syncer_thread_timed_stop.cc', 6801 'browser/sync/engine/syncer_thread_timed_stop.cc',
6818 'browser/sync/engine/syncer_thread_timed_stop.h', 6802 'browser/sync/engine/syncer_thread_timed_stop.h',
6819 'browser/sync/engine/syncer_thread_pthreads.cc',
6820 'browser/sync/engine/syncer_thread_pthreads.h',
6821 'browser/sync/engine/syncer_types.h', 6803 'browser/sync/engine/syncer_types.h',
6822 'browser/sync/engine/syncer_util.cc', 6804 'browser/sync/engine/syncer_util.cc',
6823 'browser/sync/engine/syncer_util.h', 6805 'browser/sync/engine/syncer_util.h',
6824 'browser/sync/engine/syncproto.h', 6806 'browser/sync/engine/syncproto.h',
6825 'browser/sync/engine/update_applicator.cc', 6807 'browser/sync/engine/update_applicator.cc',
6826 'browser/sync/engine/update_applicator.h', 6808 'browser/sync/engine/update_applicator.h',
6827 'browser/sync/engine/verify_updates_command.cc', 6809 'browser/sync/engine/verify_updates_command.cc',
6828 'browser/sync/engine/verify_updates_command.h', 6810 'browser/sync/engine/verify_updates_command.h',
6829 'browser/sync/protocol/service_constants.h', 6811 'browser/sync/protocol/service_constants.h',
6830 'browser/sync/syncable/blob.h', 6812 'browser/sync/syncable/blob.h',
(...skipping 12 matching lines...) Expand all
6843 'browser/sync/syncable/syncable_id.cc', 6825 'browser/sync/syncable/syncable_id.cc',
6844 'browser/sync/syncable/syncable_id.h', 6826 'browser/sync/syncable/syncable_id.h',
6845 'browser/sync/util/character_set_converters.cc', 6827 'browser/sync/util/character_set_converters.cc',
6846 'browser/sync/util/character_set_converters.h', 6828 'browser/sync/util/character_set_converters.h',
6847 'browser/sync/util/character_set_converters_linux.cc', 6829 'browser/sync/util/character_set_converters_linux.cc',
6848 'browser/sync/util/character_set_converters_win.cc', 6830 'browser/sync/util/character_set_converters_win.cc',
6849 'browser/sync/util/closure.h', 6831 'browser/sync/util/closure.h',
6850 'browser/sync/util/compat_file.h', 6832 'browser/sync/util/compat_file.h',
6851 'browser/sync/util/compat_file_posix.cc', 6833 'browser/sync/util/compat_file_posix.cc',
6852 'browser/sync/util/compat_file_win.cc', 6834 'browser/sync/util/compat_file_win.cc',
6853 'browser/sync/util/compat_pthread.h',
6854 'browser/sync/util/crypto_helpers.cc', 6835 'browser/sync/util/crypto_helpers.cc',
6855 'browser/sync/util/crypto_helpers.h', 6836 'browser/sync/util/crypto_helpers.h',
6856 'browser/sync/util/dbgq.h', 6837 'browser/sync/util/dbgq.h',
6857 'browser/sync/util/event_sys-inl.h', 6838 'browser/sync/util/event_sys-inl.h',
6858 'browser/sync/util/event_sys.h', 6839 'browser/sync/util/event_sys.h',
6859 'browser/sync/util/fast_dump.h', 6840 'browser/sync/util/fast_dump.h',
6860 'browser/sync/util/highres_timer.h', 6841 'browser/sync/util/highres_timer.h',
6861 'browser/sync/util/highres_timer_linux.cc', 6842 'browser/sync/util/highres_timer_linux.cc',
6862 'browser/sync/util/highres_timer_linux.h', 6843 'browser/sync/util/highres_timer_linux.h',
6863 'browser/sync/util/highres_timer_mac.cc', 6844 'browser/sync/util/highres_timer_mac.cc',
6864 'browser/sync/util/highres_timer_mac.h', 6845 'browser/sync/util/highres_timer_mac.h',
6865 'browser/sync/util/highres_timer_win.cc', 6846 'browser/sync/util/highres_timer_win.cc',
6866 'browser/sync/util/highres_timer_win.h', 6847 'browser/sync/util/highres_timer_win.h',
6867 'browser/sync/util/path_helpers.h', 6848 'browser/sync/util/path_helpers.h',
6868 'browser/sync/util/path_helpers_linux.cc', 6849 'browser/sync/util/path_helpers_linux.cc',
6869 'browser/sync/util/path_helpers_posix.cc', 6850 'browser/sync/util/path_helpers_posix.cc',
6870 'browser/sync/util/pthread_helpers.cc',
6871 'browser/sync/util/pthread_helpers.h',
6872 'browser/sync/util/pthread_helpers_fwd.h',
6873 'browser/sync/util/query_helpers.cc', 6851 'browser/sync/util/query_helpers.cc',
6874 'browser/sync/util/query_helpers.h', 6852 'browser/sync/util/query_helpers.h',
6875 'browser/sync/util/row_iterator.h', 6853 'browser/sync/util/row_iterator.h',
6876 'browser/sync/util/signin.h', 6854 'browser/sync/util/signin.h',
6877 'browser/sync/util/sync_types.h', 6855 'browser/sync/util/sync_types.h',
6878 'browser/sync/util/user_settings.cc', 6856 'browser/sync/util/user_settings.cc',
6879 'browser/sync/util/user_settings.h', 6857 'browser/sync/util/user_settings.h',
6880 'browser/sync/util/user_settings_posix.cc', 6858 'browser/sync/util/user_settings_posix.cc',
6881 'browser/sync/util/user_settings_win.cc', 6859 'browser/sync/util/user_settings_win.cc',
6882 ], 6860 ],
(...skipping 10 matching lines...) Expand all
6893 '../third_party/libjingle/libjingle.gyp:libjingle', 6871 '../third_party/libjingle/libjingle.gyp:libjingle',
6894 'sync_proto', 6872 'sync_proto',
6895 ], 6873 ],
6896 'conditions': [ 6874 'conditions': [
6897 ['OS=="win"', { 6875 ['OS=="win"', {
6898 'sources' : [ 6876 'sources' : [
6899 'browser/sync/util/data_encryption.cc', 6877 'browser/sync/util/data_encryption.cc',
6900 'browser/sync/util/data_encryption.h', 6878 'browser/sync/util/data_encryption.h',
6901 'browser/sync/util/path_helpers.cc', 6879 'browser/sync/util/path_helpers.cc',
6902 ], 6880 ],
6903 'dependencies': [
6904 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
6905 ],
6906 }], 6881 }],
6907 ['OS=="linux"', { 6882 ['OS=="linux"', {
6908 'defines': [ 6883 'defines': [
6909 'POSIX', 6884 'POSIX',
6910 ], 6885 ],
6911 }], 6886 }],
6912 ], 6887 ],
6913 }, 6888 },
6914 ], # targets when chrome_personalization==1 6889 ], # targets when chrome_personalization==1
6915 }], 6890 }],
6916 ], # 'conditions' 6891 ], # 'conditions'
6917 } 6892 }
6918 6893
6919 # Local Variables: 6894 # Local Variables:
6920 # tab-width:2 6895 # tab-width:2
6921 # indent-tabs-mode:nil 6896 # indent-tabs-mode:nil
6922 # End: 6897 # End:
6923 # vim: set expandtab tabstop=2 shiftwidth=2: 6898 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/sync/util/pthread_helpers_fwd.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698