Reland: Make separate net and url GN targets with and without ICU
The net and url GYP files were modified in crrev.com/933293003
so Cronet could be built side-by-side with Chrome. However GN
files are not modified. This CL keeps the GN files in sync
with the GYP files.
[email protected]
BUG=522096
Committed: https://crrev.com/4c8c6921ca6739d16f6551635328faf164848f9d
Cr-Commit-Position: refs/heads/master@{#345891}
Review URL: https://codereview.chromium.org/1287893005
Cr-Commit-Position: refs/heads/master@{#346392}
diff --git a/net/net.gypi b/net/net.gypi
index 18d016bc..bebcaee 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -427,8 +427,6 @@
'base/crypto_module_openssl.cc',
'base/data_url.cc',
'base/data_url.h',
- 'base/directory_lister.cc',
- 'base/directory_lister.h',
'base/dns_reloader.cc',
'base/dns_reloader.h',
'base/elements_upload_data_stream.cc',
@@ -807,33 +805,6 @@
'filter/gzip_header.h',
'filter/sdch_filter.cc',
'filter/sdch_filter.h',
- 'ftp/ftp_auth_cache.cc',
- 'ftp/ftp_auth_cache.h',
- 'ftp/ftp_ctrl_response_buffer.cc',
- 'ftp/ftp_ctrl_response_buffer.h',
- 'ftp/ftp_directory_listing_parser.cc',
- 'ftp/ftp_directory_listing_parser.h',
- 'ftp/ftp_directory_listing_parser_ls.cc',
- 'ftp/ftp_directory_listing_parser_ls.h',
- 'ftp/ftp_directory_listing_parser_vms.cc',
- 'ftp/ftp_directory_listing_parser_vms.h',
- 'ftp/ftp_directory_listing_parser_windows.cc',
- 'ftp/ftp_directory_listing_parser_windows.h',
- 'ftp/ftp_network_layer.cc',
- 'ftp/ftp_network_layer.h',
- 'ftp/ftp_network_session.cc',
- 'ftp/ftp_network_session.h',
- 'ftp/ftp_network_transaction.cc',
- 'ftp/ftp_network_transaction.h',
- 'ftp/ftp_request_info.h',
- 'ftp/ftp_response_info.cc',
- 'ftp/ftp_response_info.h',
- 'ftp/ftp_server_type_histograms.cc',
- 'ftp/ftp_server_type_histograms.h',
- 'ftp/ftp_transaction.h',
- 'ftp/ftp_transaction_factory.h',
- 'ftp/ftp_util.cc',
- 'ftp/ftp_util.h',
'http/des.cc',
'http/des.h',
'http/disk_based_cert_cache.cc',
@@ -1184,10 +1155,6 @@
'url_request/certificate_report_sender.h',
'url_request/data_protocol_handler.cc',
'url_request/data_protocol_handler.h',
- 'url_request/file_protocol_handler.cc',
- 'url_request/file_protocol_handler.h',
- 'url_request/ftp_protocol_handler.cc',
- 'url_request/ftp_protocol_handler.h',
'url_request/http_user_agent_settings.h',
'url_request/redirect_info.cc',
'url_request/redirect_info.h',
@@ -1223,14 +1190,8 @@
'url_request/url_request_data_job.h',
'url_request/url_request_error_job.cc',
'url_request/url_request_error_job.h',
- 'url_request/url_request_file_dir_job.cc',
- 'url_request/url_request_file_dir_job.h',
- 'url_request/url_request_file_job.cc',
- 'url_request/url_request_file_job.h',
'url_request/url_request_filter.cc',
'url_request/url_request_filter.h',
- 'url_request/url_request_ftp_job.cc',
- 'url_request/url_request_ftp_job.h',
'url_request/url_request_http_job.cc',
'url_request/url_request_http_job.h',
'url_request/url_request_intercepting_job_factory.cc',
@@ -1266,45 +1227,6 @@
'url_request/view_cache_helper.h',
'url_request/websocket_handshake_userdata_key.cc',
'url_request/websocket_handshake_userdata_key.h',
- 'websockets/websocket_basic_handshake_stream.cc',
- 'websockets/websocket_basic_handshake_stream.h',
- 'websockets/websocket_basic_stream.cc',
- 'websockets/websocket_basic_stream.h',
- 'websockets/websocket_channel.cc',
- 'websockets/websocket_channel.h',
- 'websockets/websocket_deflate_predictor.h',
- 'websockets/websocket_deflate_predictor_impl.cc',
- 'websockets/websocket_deflate_predictor_impl.h',
- 'websockets/websocket_deflate_stream.cc',
- 'websockets/websocket_deflate_stream.h',
- 'websockets/websocket_deflater.cc',
- 'websockets/websocket_deflater.h',
- 'websockets/websocket_errors.cc',
- 'websockets/websocket_errors.h',
- 'websockets/websocket_extension.cc',
- 'websockets/websocket_extension.h',
- 'websockets/websocket_extension_parser.cc',
- 'websockets/websocket_extension_parser.h',
- 'websockets/websocket_frame.cc',
- 'websockets/websocket_frame.h',
- 'websockets/websocket_frame_parser.cc',
- 'websockets/websocket_frame_parser.h',
- 'websockets/websocket_handshake_challenge.cc',
- 'websockets/websocket_handshake_challenge.h',
- 'websockets/websocket_handshake_constants.cc',
- 'websockets/websocket_handshake_constants.h',
- 'websockets/websocket_handshake_request_info.cc',
- 'websockets/websocket_handshake_request_info.h',
- 'websockets/websocket_handshake_response_info.cc',
- 'websockets/websocket_handshake_response_info.h',
- 'websockets/websocket_handshake_stream_base.h',
- 'websockets/websocket_handshake_stream_create_helper.cc',
- 'websockets/websocket_handshake_stream_create_helper.h',
- 'websockets/websocket_inflater.cc',
- 'websockets/websocket_inflater.h',
- 'websockets/websocket_mux.h',
- 'websockets/websocket_stream.cc',
- 'websockets/websocket_stream.h',
],
'net_extras_sources': [
'extras/sqlite/cookie_crypto_delegate.h',
@@ -1867,6 +1789,90 @@
'net_base_test_mac_ios_sources': [
'base/mac/url_conversions_unittest.mm',
],
+ 'net_file_support_sources': [
+ "base/directory_lister.cc",
+ "base/directory_lister.h",
+ "url_request/file_protocol_handler.cc",
+ "url_request/file_protocol_handler.h",
+ "url_request/url_request_file_dir_job.cc",
+ "url_request/url_request_file_dir_job.h",
+ "url_request/url_request_file_job.cc",
+ "url_request/url_request_file_job.h",
+ ],
+ 'net_ftp_support_sources': [
+ "ftp/ftp_auth_cache.cc",
+ "ftp/ftp_auth_cache.h",
+ "ftp/ftp_ctrl_response_buffer.cc",
+ "ftp/ftp_ctrl_response_buffer.h",
+ "ftp/ftp_directory_listing_parser.cc",
+ "ftp/ftp_directory_listing_parser.h",
+ "ftp/ftp_directory_listing_parser_ls.cc",
+ "ftp/ftp_directory_listing_parser_ls.h",
+ "ftp/ftp_directory_listing_parser_vms.cc",
+ "ftp/ftp_directory_listing_parser_vms.h",
+ "ftp/ftp_directory_listing_parser_windows.cc",
+ "ftp/ftp_directory_listing_parser_windows.h",
+ "ftp/ftp_network_layer.cc",
+ "ftp/ftp_network_layer.h",
+ "ftp/ftp_network_session.cc",
+ "ftp/ftp_network_session.h",
+ "ftp/ftp_network_transaction.cc",
+ "ftp/ftp_network_transaction.h",
+ "ftp/ftp_request_info.h",
+ "ftp/ftp_response_info.cc",
+ "ftp/ftp_response_info.h",
+ "ftp/ftp_server_type_histograms.cc",
+ "ftp/ftp_server_type_histograms.h",
+ "ftp/ftp_transaction.h",
+ "ftp/ftp_transaction_factory.h",
+ "ftp/ftp_util.cc",
+ "ftp/ftp_util.h",
+ "url_request/ftp_protocol_handler.cc",
+ "url_request/ftp_protocol_handler.h",
+ "url_request/url_request_ftp_job.cc",
+ "url_request/url_request_ftp_job.h",
+ ],
+ 'net_websockets_sources': [
+ "websockets/websocket_basic_handshake_stream.cc",
+ "websockets/websocket_basic_handshake_stream.h",
+ "websockets/websocket_basic_stream.cc",
+ "websockets/websocket_basic_stream.h",
+ "websockets/websocket_channel.cc",
+ "websockets/websocket_channel.h",
+ "websockets/websocket_deflate_predictor.h",
+ "websockets/websocket_deflate_predictor_impl.cc",
+ "websockets/websocket_deflate_predictor_impl.h",
+ "websockets/websocket_deflate_stream.cc",
+ "websockets/websocket_deflate_stream.h",
+ "websockets/websocket_deflater.cc",
+ "websockets/websocket_deflater.h",
+ "websockets/websocket_errors.cc",
+ "websockets/websocket_errors.h",
+ "websockets/websocket_extension.cc",
+ "websockets/websocket_extension.h",
+ "websockets/websocket_extension_parser.cc",
+ "websockets/websocket_extension_parser.h",
+ "websockets/websocket_frame.cc",
+ "websockets/websocket_frame.h",
+ "websockets/websocket_frame_parser.cc",
+ "websockets/websocket_frame_parser.h",
+ "websockets/websocket_handshake_challenge.cc",
+ "websockets/websocket_handshake_challenge.h",
+ "websockets/websocket_handshake_constants.cc",
+ "websockets/websocket_handshake_constants.h",
+ "websockets/websocket_handshake_request_info.cc",
+ "websockets/websocket_handshake_request_info.h",
+ "websockets/websocket_handshake_response_info.cc",
+ "websockets/websocket_handshake_response_info.h",
+ "websockets/websocket_handshake_stream_base.h",
+ "websockets/websocket_handshake_stream_create_helper.cc",
+ "websockets/websocket_handshake_stream_create_helper.h",
+ "websockets/websocket_inflater.cc",
+ "websockets/websocket_inflater.h",
+ "websockets/websocket_mux.h",
+ "websockets/websocket_stream.cc",
+ "websockets/websocket_stream.h",
+ ],
'net_docs_script': 'tools/net_docs/net_docs.py',
'net_docs_sources': [
'README.md',
