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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/BUILD.gn

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « mojo/tools/roll/skia_build.patch ('k') | net/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 6be160e2ac2e358111bddae0c9c9c0cf824d930e..cf1d98e7802962ee4dc5f7378bafed4172d152f7 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -113,8 +113,8 @@ component("net") {
sources -= [
"http/http_auth_gssapi_posix.cc",
"http/http_auth_gssapi_posix.h",
- "http/http_auth_handler_negotiate.h",
"http/http_auth_handler_negotiate.cc",
+ "http/http_auth_handler_negotiate.h",
]
}
@@ -130,12 +130,12 @@ component("net") {
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",
- "url_request/file_protocol_handler.cc",
- "url_request/file_protocol_handler.h",
]
}
@@ -398,10 +398,10 @@ component("net") {
"websockets/websocket_frame.h",
"websockets/websocket_frame_parser.cc",
"websockets/websocket_frame_parser.h",
- "websockets/websocket_handshake_constants.cc",
- "websockets/websocket_handshake_constants.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",
@@ -477,10 +477,10 @@ component("net") {
"cert/test_root_certs_nss.cc",
"cert/x509_util_nss.cc",
"cert/x509_util_nss.h",
- "proxy/proxy_resolver_mac.cc",
- "proxy/proxy_server_mac.cc",
"ocsp/nss_ocsp.cc",
"ocsp/nss_ocsp.h",
+ "proxy/proxy_resolver_mac.cc",
+ "proxy/proxy_server_mac.cc",
]
set_sources_assignment_filter(sources_assignment_filter)
@@ -503,11 +503,11 @@ component("net") {
# are needed.
set_sources_assignment_filter([])
sources += [
- "base/platform_mime_util_linux.cc",
"base/address_tracker_linux.cc",
"base/address_tracker_linux.h",
"base/net_util_linux.cc",
"base/net_util_linux.h",
+ "base/platform_mime_util_linux.cc",
]
set_sources_assignment_filter(sources_assignment_filter)
@@ -593,8 +593,8 @@ executable("dump_cache") {
"tools/dump_cache/simple_cache_dumper.h",
"tools/dump_cache/url_to_filename_encoder.cc",
"tools/dump_cache/url_to_filename_encoder.h",
- "tools/dump_cache/url_utilities.h",
"tools/dump_cache/url_utilities.cc",
+ "tools/dump_cache/url_utilities.h",
]
configs += [ ":net_win_size_truncation" ]
@@ -670,10 +670,10 @@ source_set("test_support") {
"test/python_utils.h",
"test/spawned_test_server/base_test_server.cc",
"test/spawned_test_server/base_test_server.h",
- "test/spawned_test_server/local_test_server_posix.cc",
- "test/spawned_test_server/local_test_server_win.cc",
"test/spawned_test_server/local_test_server.cc",
"test/spawned_test_server/local_test_server.h",
+ "test/spawned_test_server/local_test_server_posix.cc",
+ "test/spawned_test_server/local_test_server_win.cc",
"test/spawned_test_server/remote_test_server.cc",
"test/spawned_test_server/remote_test_server.h",
"test/spawned_test_server/spawned_test_server.h",
@@ -794,6 +794,35 @@ if (use_v8_in_net) {
}
}
+if (use_v8_in_net && !is_android) {
+ source_set("net_browser_services") {
+ sources = [
+ "dns/mojo_host_resolver_impl.cc",
+ "dns/mojo_host_resolver_impl.h",
+ ]
+
+ public_deps = [
+ ":mojo_type_converters",
+ ":net",
+ "//net/interfaces",
+ "//mojo/public/cpp/bindings",
+ ]
+ }
+
+ source_set("mojo_type_converters") {
+ sources = [
+ "dns/mojo_type_converters.cc",
+ "dns/mojo_type_converters.h",
+ ]
+
+ public_deps = [
+ ":net",
+ "//net/interfaces",
+ "//mojo/public/cpp/bindings",
+ ]
+ }
+}
+
if (!is_ios && !is_android) {
executable("crash_cache") {
testonly = true
@@ -938,20 +967,20 @@ if (is_linux) {
sources = [
"tools/dump_cache/url_to_filename_encoder.cc",
"tools/dump_cache/url_to_filename_encoder.h",
- "tools/dump_cache/url_utilities.h",
"tools/dump_cache/url_utilities.cc",
- "tools/flip_server/acceptor_thread.h",
+ "tools/dump_cache/url_utilities.h",
"tools/flip_server/acceptor_thread.cc",
+ "tools/flip_server/acceptor_thread.h",
+ "tools/flip_server/constants.h",
"tools/flip_server/create_listener.cc",
"tools/flip_server/create_listener.h",
- "tools/flip_server/constants.h",
"tools/flip_server/flip_config.cc",
"tools/flip_server/flip_config.h",
"tools/flip_server/http_interface.cc",
"tools/flip_server/http_interface.h",
"tools/flip_server/loadtime_measurement.h",
- "tools/flip_server/mem_cache.h",
"tools/flip_server/mem_cache.cc",
+ "tools/flip_server/mem_cache.h",
"tools/flip_server/output_ordering.cc",
"tools/flip_server/output_ordering.h",
"tools/flip_server/ring_buffer.cc",
@@ -959,10 +988,10 @@ if (is_linux) {
"tools/flip_server/sm_connection.cc",
"tools/flip_server/sm_connection.h",
"tools/flip_server/sm_interface.h",
- "tools/flip_server/spdy_ssl.cc",
- "tools/flip_server/spdy_ssl.h",
"tools/flip_server/spdy_interface.cc",
"tools/flip_server/spdy_interface.h",
+ "tools/flip_server/spdy_ssl.cc",
+ "tools/flip_server/spdy_ssl.h",
"tools/flip_server/spdy_util.cc",
"tools/flip_server/spdy_util.h",
"tools/flip_server/streamer_interface.cc",
@@ -1017,8 +1046,8 @@ if (is_linux) {
"tools/quic/quic_client_session.h",
"tools/quic/quic_default_packet_writer.cc",
"tools/quic/quic_default_packet_writer.h",
- "tools/quic/quic_dispatcher.h",
"tools/quic/quic_dispatcher.cc",
+ "tools/quic/quic_dispatcher.h",
"tools/quic/quic_epoll_clock.cc",
"tools/quic/quic_epoll_clock.h",
"tools/quic/quic_epoll_connection_helper.cc",
@@ -1039,8 +1068,8 @@ if (is_linux) {
"tools/quic/quic_spdy_client_stream.h",
"tools/quic/quic_spdy_server_stream.cc",
"tools/quic/quic_spdy_server_stream.h",
- "tools/quic/quic_time_wait_list_manager.h",
"tools/quic/quic_time_wait_list_manager.cc",
+ "tools/quic/quic_time_wait_list_manager.h",
]
deps = [
":balsa",
@@ -1268,8 +1297,8 @@ if (!is_android && !is_win && !is_mac) {
"websockets/websocket_deflate_predictor_impl_test.cc",
"websockets/websocket_deflate_stream_test.cc",
"websockets/websocket_deflater_test.cc",
- "websockets/websocket_errors_test.cc",
"websockets/websocket_end_to_end_test.cc",
+ "websockets/websocket_errors_test.cc",
"websockets/websocket_extension_parser_test.cc",
"websockets/websocket_frame_parser_test.cc",
"websockets/websocket_frame_test.cc",
@@ -1321,9 +1350,19 @@ if (!is_android && !is_win && !is_mac) {
deps += [ ":net_with_v8" ]
} else {
sources -= [
- "proxy/proxy_resolver_v8_unittest.cc",
"proxy/proxy_resolver_v8_tracing_unittest.cc",
+ "proxy/proxy_resolver_v8_unittest.cc",
+ ]
+ }
+
+ if (use_v8_in_net && !is_android) {
+ deps += [
+ ":net_browser_services",
+ "//mojo/environment:chromium",
+ "//mojo/edk/system",
]
+ } else {
+ sources -= [ "dns/mojo_host_resolver_impl_unittest.cc" ]
}
if (!enable_mdns) {
« no previous file with comments | « mojo/tools/roll/skia_build.patch ('k') | net/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698