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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 28514)
+++ chrome/chrome.gyp (working copy)
@@ -4656,13 +4656,6 @@
'sync',
'sync_proto',
],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- '../third_party/pthreads-win32/pthreads.gyp:pthreads',
- ],
- }],
- ],
}],
],
},
@@ -4877,7 +4870,6 @@
'urlmon.dll',
'imm32.dll',
'iphlpapi.dll',
- 'pthreads.dll',
],
'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
@@ -6665,11 +6657,6 @@
'sync_proto',
],
'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- '../third_party/pthreads-win32/pthreads.gyp:pthreads',
- ],
- }],
['OS=="linux"', {
'defines': [
'POSIX',
@@ -6730,9 +6717,6 @@
],
'conditions': [
['OS=="win"', {
- 'dependencies': [
- '../third_party/pthreads-win32/pthreads.gyp:pthreads',
- ],
'link_settings': {
'libraries': [
'-lcrypt32.lib',
@@ -6816,8 +6800,6 @@
'browser/sync/engine/syncer_thread.h',
'browser/sync/engine/syncer_thread_timed_stop.cc',
'browser/sync/engine/syncer_thread_timed_stop.h',
- 'browser/sync/engine/syncer_thread_pthreads.cc',
- 'browser/sync/engine/syncer_thread_pthreads.h',
'browser/sync/engine/syncer_types.h',
'browser/sync/engine/syncer_util.cc',
'browser/sync/engine/syncer_util.h',
@@ -6850,7 +6832,6 @@
'browser/sync/util/compat_file.h',
'browser/sync/util/compat_file_posix.cc',
'browser/sync/util/compat_file_win.cc',
- 'browser/sync/util/compat_pthread.h',
'browser/sync/util/crypto_helpers.cc',
'browser/sync/util/crypto_helpers.h',
'browser/sync/util/dbgq.h',
@@ -6867,9 +6848,6 @@
'browser/sync/util/path_helpers.h',
'browser/sync/util/path_helpers_linux.cc',
'browser/sync/util/path_helpers_posix.cc',
- 'browser/sync/util/pthread_helpers.cc',
- 'browser/sync/util/pthread_helpers.h',
- 'browser/sync/util/pthread_helpers_fwd.h',
'browser/sync/util/query_helpers.cc',
'browser/sync/util/query_helpers.h',
'browser/sync/util/row_iterator.h',
@@ -6900,9 +6878,6 @@
'browser/sync/util/data_encryption.h',
'browser/sync/util/path_helpers.cc',
],
- 'dependencies': [
- '../third_party/pthreads-win32/pthreads.gyp:pthreads',
- ],
}],
['OS=="linux"', {
'defines': [
« 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