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

Unified Diff: net/net.gyp

Issue 21743003: Rearrange net.gyp to enable adding flip server unittests to net_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index a973e0808726a40559b8f0a4f1ea9dab4ce9f867..059bbf47a3ffc3bba24cc4a376794ae1e8c33576 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1852,7 +1852,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',
@@ -2605,8 +2607,8 @@
],
},
{
- 'target_name': 'flip_in_mem_edsm_server',
- 'type': 'executable',
+ 'target_name': 'flip_in_mem_edsm_server_library',
+ 'type': 'static_library',
'cflags': [
'-Wno-deprecated',
],
@@ -2628,7 +2630,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',
@@ -2655,6 +2656,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': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698