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

Unified Diff: net/BUILD.gn

Issue 1272193002: Editing sources for //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Adding_sync_to_deps
Patch Set: Editing iOS sources for //net Created 5 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 | « no previous file | no next file » | 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 7da87e46e627f367dd5f59c601006fdbac7816f5..8db0cfb56aceebc8c76b4d86dae9cdd64901028e 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -457,6 +457,8 @@ component("net") {
# files.
set_sources_assignment_filter([])
sources += [
+ "base/mac/url_conversions.h",
+ "base/mac/url_conversions.mm",
"base/network_change_notifier_mac.cc",
"base/network_config_watcher_mac.cc",
"base/network_interfaces_mac.cc",
@@ -680,6 +682,8 @@ source_set("test_support") {
"test/spawned_test_server/spawned_test_server.h",
"test/spawned_test_server/spawner_communicator.cc",
"test/spawned_test_server/spawner_communicator.h",
+ "test/url_request/ssl_certificate_error_job.cc",
+ "test/url_request/ssl_certificate_error_job.h",
"test/url_request/url_request_failed_job.cc",
"test/url_request/url_request_failed_job.h",
"test/url_request/url_request_mock_data_job.cc",
@@ -1286,29 +1290,30 @@ source_set("simple_quic_tools") {
]
}
-executable("quic_client") {
- sources = [
- "tools/quic/quic_simple_client_bin.cc",
- ]
- deps = [
- ":net",
- ":simple_quic_tools",
- "//base",
- "//url",
- ]
-}
-
-executable("quic_server") {
- sources = [
- "tools/quic/quic_simple_server_bin.cc",
- ]
- deps = [
- ":net",
- ":simple_quic_tools",
- "//base",
- "//third_party/boringssl",
- "//third_party/protobuf:protobuf_lite",
- ]
+if (!is_ios) {
+ executable("quic_client") {
+ sources = [
+ "tools/quic/quic_simple_client_bin.cc",
+ ]
+ deps = [
+ ":net",
+ ":simple_quic_tools",
+ "//base",
+ "//url",
+ ]
+ }
+ executable("quic_server") {
+ sources = [
+ "tools/quic/quic_simple_server_bin.cc",
+ ]
+ deps = [
+ ":net",
+ ":simple_quic_tools",
+ "//base",
+ "//third_party/boringssl",
+ "//third_party/protobuf:protobuf_lite",
+ ]
+ }
}
# TODO(GYP): Delete this after we've converted everything to GN.
@@ -1323,6 +1328,14 @@ group("net_unittests_run") {
test("net_unittests") {
sources = gypi_values.net_test_sources
+ if (is_ios) {
+ sources -= [
+ "websockets/websocket_stream_cookie_test.cc",
+ "websockets/websocket_stream_create_test_base.cc",
+ "websockets/websocket_stream_create_test_base.h",
+ ]
+ }
+
configs += [
"//build/config:precompiled_headers",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698