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

Unified Diff: net/net.gyp

Issue 7587003: Revert 95910 - Revert 95907 - Clean up SSL false start blacklist code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « net/base/ssl_false_start_blacklist_unittest.cc ('k') | third_party/libevent/libevent.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 96209)
+++ net/net.gyp (working copy)
@@ -194,6 +194,7 @@
'base/ssl_config_service_defaults.cc',
'base/ssl_config_service_defaults.h',
'base/ssl_false_start_blacklist.cc',
+ 'base/ssl_false_start_blacklist.h',
'base/ssl_info.cc',
'base/ssl_info.h',
'base/static_cookie_policy.cc',
@@ -1332,11 +1333,16 @@
'target_name': 'ssl_false_start_blacklist_process',
'type': 'executable',
'toolsets': ['host'],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ ],
'include_dirs': [
'..',
],
'sources': [
'base/ssl_false_start_blacklist_process.cc',
+ 'base/ssl_false_start_blacklist.h',
],
},
],
@@ -1351,7 +1357,7 @@
],
'dependencies': [
'../base/base.gyp:base',
- 'net.gyp:net',
+ 'net',
'../third_party/openssl/openssl.gyp:openssl',
],
'sources': [
@@ -1413,7 +1419,7 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- 'net.gyp:net',
+ 'net',
],
'sources': [
'curvecp/circular_buffer.cc',
@@ -1448,8 +1454,8 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
- 'net.gyp:curvecp',
- 'net.gyp:net',
+ 'curvecp',
+ 'net',
'net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
« no previous file with comments | « net/base/ssl_false_start_blacklist_unittest.cc ('k') | third_party/libevent/libevent.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698