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

Unified Diff: chrome/chrome.gyp

Issue 242118: Change the Windows build to statically link the sync library. (Closed)
Patch Set: Created 11 years, 3 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
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1ac712db7b2fe6bc260067720d29101f34dd3258..289e8e013b15e46fe857ae192f5d33db20123c68 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4667,7 +4667,7 @@
'type': 'none',
}, {
# Build sync.
- 'type': 'shared_library',
+ 'type': '<(library)',
'sources': [
'browser/sync/engine/syncapi.cc',
],
@@ -4676,7 +4676,6 @@
'<(protoc_out_dir)',
],
'defines' : [
- 'COMPILING_SYNCAPI_LIBRARY',
'_CRT_SECURE_NO_WARNINGS',
'_USE_32BIT_TIME_T',
],
@@ -4694,31 +4693,9 @@
],
'conditions': [
['OS=="win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'ImportLibrary': '$(OutDir)\\lib\\syncapi.lib',
- 'ProgramDatabaseFile': '$(OutDir)\\syncapi_dll.pdb',
- },
- },
- 'link_settings': {
- 'libraries': [
- '-lcrypt32.lib',
- '-liphlpapi.lib',
- '-lsecur32.lib',
- ]
- },
'dependencies': [
'../third_party/pthreads-win32/pthreads.gyp:pthreads',
],
- 'direct_dependent_settings': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'DelayLoadDLLs': [
- 'syncapi.dll',
- ],
- },
- },
- },
}],
['OS=="linux"', {
'defines': [
@@ -4939,6 +4916,8 @@
'psapi.dll',
'urlmon.dll',
'imm32.dll',
+ 'iphlpapi.dll',
+ 'pthreads.dll',
],
'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
@@ -6590,7 +6569,6 @@
'<(protoc_out_dir)',
],
'defines' : [
- 'COMPILING_SYNCAPI_LIBRARY',
'SYNC_ENGINE_VERSION_STRING="Unknown"',
'_CRT_SECURE_NO_WARNINGS',
'_USE_32BIT_TIME_T',
@@ -6759,7 +6737,6 @@
'<(protoc_out_dir)',
],
'defines' : [
- 'COMPILING_SYNCAPI_LIBRARY',
'SYNC_ENGINE_VERSION_STRING="Unknown"',
'_CRT_SECURE_NO_WARNINGS',
'_USE_32BIT_TIME_T',

Powered by Google App Engine
This is Rietveld 408576698