Rearrange net.gyp to enable adding flip server unittests to net_unittests.
flip_in_mem_edsm_server should have unittests.
BUG=267354
[email protected]
Review URL: https://chromiumcodereview.appspot.com/21743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215802 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/net.gyp b/net/net.gyp
index 70436d126..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': [
