Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
diff --git a/net/net.gyp b/net/net.gyp
index 4f99432..a189432 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -869,6 +869,8 @@
'socket/nss_ssl_util.cc',
'socket/nss_ssl_util.h',
'socket/server_socket.h',
+ 'socket/socket_descriptor.cc',
+ 'socket/socket_descriptor.h',
'socket/socket_net_log_params.cc',
'socket/socket_net_log_params.h',
'socket/socket.h',
@@ -2911,6 +2913,21 @@
},
],
}],
+ ['OS == "android" or OS == "linux"', {
+ 'targets': [
+ {
+ 'target_name': 'disk_cache_memory_test',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'net',
+ ],
+ 'sources': [
+ 'tools/disk_cache_memory_test/disk_cache_memory_test.cc',
+ ],
+ },
+ ],
+ }],
['test_isolation_mode != "noop"', {
'targets': [
{