diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:20:41 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:20:41 +0000 |
| commit | 71950cbb6c34c78c7d9863ba80e17b101ac3acee (patch) | |
| tree | 1fb81d0233c853ae1267bfa300c985e8425e10c1 /net | |
| parent | db7a78c5e9bd35c11393377d91b3792c456de115 (diff) | |
| download | chromium_src-71950cbb6c34c78c7d9863ba80e17b101ac3acee.zip chromium_src-71950cbb6c34c78c7d9863ba80e17b101ac3acee.tar.gz chromium_src-71950cbb6c34c78c7d9863ba80e17b101ac3acee.tar.bz2 | |
net: enable components build on Linux
This refactors the gyp file into components parts (used on
Linux and Win) and Windows-specific parts.
Review URL: http://codereview.chromium.org/7338005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/net/net.gyp b/net/net.gyp index 1186975d..1eb0a8d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -9,6 +9,7 @@ 'targets': [ { 'target_name': 'net', + 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:base_i18n', @@ -793,7 +794,6 @@ }, ], [ 'OS == "win"', { - 'type': '<(component)', 'sources!': [ 'http/http_auth_handler_ntlm_portable.cc', 'socket/tcp_client_socket_libevent.cc', @@ -810,7 +810,6 @@ 'tld_cleanup', ], }, { # else: OS != "win" - 'type': 'static_library', 'sources!': [ 'base/winsock_init.cc', 'base/winsock_init.h', @@ -821,23 +820,29 @@ ], }, ], - [ 'OS == "win" and component == "shared_library"', { + [ 'component == "shared_library"', { 'defines': [ 'NET_DLL', 'NET_IMPLEMENTATION', ], - 'msvs_disabled_warnings': [ - # class 'std::xx' needs to have dll-interface. - 4251, - ], 'direct_dependent_settings': { 'defines': [ 'NET_DLL', ], - 'msvs_disabled_warnings': [ - 4251, - ], }, + 'conditions': [ + [ 'OS == "win"', { + 'msvs_disabled_warnings': [ + # class 'std::xx' needs to have dll-interface. + 4251, + ], + 'direct_dependent_settings': { + 'msvs_disabled_warnings': [ + 4251, + ], + }, + }], + ], }], [ 'OS == "mac"', { 'dependencies': [ |