diff options
| author | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 05:44:51 +0000 |
|---|---|---|
| committer | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 05:44:51 +0000 |
| commit | 29e052312959f3ad4cf91529290dd2f4bc3ddccf (patch) | |
| tree | d28f71b614e28fe420c7f5112301ed2d99f7550b | |
| parent | d10a9bbea4a02abbe24cf31462744bb00cf32b74 (diff) | |
| download | chromium_src-29e052312959f3ad4cf91529290dd2f4bc3ddccf.zip chromium_src-29e052312959f3ad4cf91529290dd2f4bc3ddccf.tar.gz chromium_src-29e052312959f3ad4cf91529290dd2f4bc3ddccf.tar.bz2 | |
Rearrange net.gyp to enable adding flip server unittests to net_unittests.
flip_in_mem_edsm_server should have unittests.
BUG=267354
R=rch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/21743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215802 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/net.gyp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp index 70436d1..8942367 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1854,7 +1854,9 @@ 'conditions': [ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 'dependencies': [ - 'quic_library' + 'quic_library', + 'flip_in_mem_edsm_server_library', + 'flip_balsa_and_epoll_library', ], 'sources': [ 'tools/flip_server/simple_buffer.cc', @@ -2607,8 +2609,8 @@ ], }, { - 'target_name': 'flip_in_mem_edsm_server', - 'type': 'executable', + 'target_name': 'flip_in_mem_edsm_server_library', + 'type': 'static_library', 'cflags': [ '-Wno-deprecated', ], @@ -2630,7 +2632,6 @@ 'tools/flip_server/create_listener.h', 'tools/flip_server/flip_config.cc', 'tools/flip_server/flip_config.h', - 'tools/flip_server/flip_in_mem_edsm_server.cc', 'tools/flip_server/http_interface.cc', 'tools/flip_server/http_interface.h', 'tools/flip_server/loadtime_measurement.h', @@ -2657,6 +2658,22 @@ ], }, { + 'target_name': 'flip_in_mem_edsm_server', + 'type': 'executable', + 'cflags': [ + '-Wno-deprecated', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'flip_balsa_and_epoll_library', + 'flip_in_mem_edsm_server_library', + 'net', + ], + 'sources': [ + 'tools/flip_server/flip_in_mem_edsm_server.cc', + ], + }, + { 'target_name': 'quic_library', 'type': 'static_library', 'dependencies': [ |