diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 19:36:22 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 19:36:22 +0000 |
| commit | abd4aba8725fdd0e604f727e617105725b709259 (patch) | |
| tree | 007c410bf538052e0868b545f5a0bac497904331 /base/base.gypi | |
| parent | 11f85946bf3db866584e83c92bbea9c2a769fcd7 (diff) | |
| download | chromium_src-abd4aba8725fdd0e604f727e617105725b709259.zip chromium_src-abd4aba8725fdd0e604f727e617105725b709259.tar.gz chromium_src-abd4aba8725fdd0e604f727e617105725b709259.tar.bz2 | |
Use nss_util.{h,cc} also on Windows. On Windows, NSS is
initialized without databases because we'll continue to use
the Windows system certificate store.
base\third_party\nss is now compiled with -DNO_NSPR_10_SUPPORT
(because the NSPR 1.0 types int8 - int64 and uint8 - uint64
conflict with the same-named types in "base/basictypes.h"),
so the uint32 type needs to be replaced by unsigned int.
R=agl,mark
BUG=28744
TEST=No build errors.
Review URL: http://codereview.chromium.org/557012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/base/base.gypi b/base/base.gypi index 3fe12ae..9cd56dc 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -289,8 +289,6 @@ 'directory_watcher_inotify.cc', 'linux_util.cc', 'message_pump_glib.cc', - 'nss_util.cc', - 'nss_util.h', ], },], [ 'OS != "linux"', { @@ -322,13 +320,19 @@ ], }, ], - [ 'OS != "mac"', { + [ 'OS == "mac"', { + 'sources!': [ + # TODO(wtc): Remove nss_util.{cc,h} when http://crbug.com/30689 + # is fixed. + 'nss_util.cc', + 'nss_util.h', + ], + }, { # OS != "mac" 'sources!': [ 'crypto/cssm_init.cc', 'crypto/cssm_init.h', ], - } - ], + },], [ 'OS == "win"', { 'include_dirs': [ '../chrome/third_party/wtl/include', @@ -432,7 +436,11 @@ ], }, },], - [ 'OS != "win"', { + [ 'OS == "win"', { + 'dependencies': [ + '../third_party/nss/nss.gyp:nss', + ], + }, { # OS != "win" 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], 'sources!': [ 'third_party/purify/pure_api.c', @@ -451,8 +459,7 @@ 'win_util.cc', 'wmi_util.cc', ], - }, - ], + },], ], 'sources': [ 'crypto/cssm_init.cc', |