diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 16:30:19 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 16:30:19 +0000 |
| commit | d0672be51d1a4c25f3dd7d91f9d9c1293b33adc6 (patch) | |
| tree | 93a2a7f1b8d3426a4e65692b56e12e4011b60241 /net/net.gyp | |
| parent | a5e842bf6fda331cdacf3a8d56da19a3ea8d3d0b (diff) | |
| download | chromium_src-d0672be51d1a4c25f3dd7d91f9d9c1293b33adc6.zip chromium_src-d0672be51d1a4c25f3dd7d91f9d9c1293b33adc6.tar.gz chromium_src-d0672be51d1a4c25f3dd7d91f9d9c1293b33adc6.tar.bz2 | |
net: move SSL host info serialisation into SSLHostInfo
This is a prelude to SSLHostInfo being able to kick off certificate
validation based on predicted certificates.
In order for that to happen, SSLHostInfo has to be able to parse the
contents of the saved data, therefore the
serialisation/deserialisation is moved into SSLHostInfo and we use a
protocol buffer to clean things up.
TEST=net_unittests
BUG=none
Review URL: http://codereview.chromium.org/3915001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index e8a32c9..f0306b1 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -173,8 +173,6 @@ 'base/ssl_config_service_win.cc', 'base/ssl_config_service_win.h', 'base/ssl_false_start_blacklist.cc', - 'base/ssl_host_info.cc', - 'base/ssl_host_info.h', 'base/ssl_info.cc', 'base/ssl_info.h', 'base/static_cookie_policy.cc', @@ -324,6 +322,7 @@ '../third_party/zlib/zlib.gyp:zlib', 'net_base', 'net_resources', + 'ssl_host_info', ], 'sources': [ 'disk_cache/addr.cc', @@ -995,6 +994,45 @@ ], }, { + # This is a separate target in order to limit the scope of the protobuf + # includes. + 'target_name': 'ssl_host_info', + 'type': '<(library)', + 'dependencies': [ + '../base/base.gyp:base', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + ], + 'sources': [ + 'socket/ssl_host_info.proto', + 'socket/ssl_host_info.cc', + 'socket/ssl_host_info.h', + ], + 'rules': [ + { + 'rule_name': 'genproto', + 'extension': 'proto', + 'inputs': [ + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/protoc_out/net/socket/<(RULE_INPUT_ROOT).pb.h', + '<(SHARED_INTERMEDIATE_DIR)/protoc_out/net/socket/<(RULE_INPUT_ROOT).pb.cc', + ], + 'action': [ + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', + 'socket/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', + '--cpp_out=<(SHARED_INTERMEDIATE_DIR)/protoc_out/net', + ], + 'message': 'Generating C++ code from <(RULE_INPUT_PATH)', + 'process_outputs_as_sources': 1, + }, + ], + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/protoc_out/net', + '<(SHARED_INTERMEDIATE_DIR)/protoc_out', + ], + }, + { 'target_name': 'net_perftests', 'type': 'executable', 'dependencies': [ |