diff options
| -rw-r--r-- | build/config/ios/BUILD.gn | 1 | ||||
| -rw-r--r-- | components/BUILD.gn | 4 | ||||
| -rw-r--r-- | components/sessions/BUILD.gn | 19 | ||||
| -rw-r--r-- | components/sync_driver/BUILD.gn | 6 | ||||
| -rw-r--r-- | net/BUILD.gn | 2 |
5 files changed, 24 insertions, 8 deletions
diff --git a/build/config/ios/BUILD.gn b/build/config/ios/BUILD.gn index 07e8a86..3b9f846 100644 --- a/build/config/ios/BUILD.gn +++ b/build/config/ios/BUILD.gn @@ -23,6 +23,7 @@ config("runtime_library") { common_flags += [ "-miphoneos-version-min=$ios_deployment_target" ] } + asmflags = common_flags cflags = common_flags ldflags = common_flags } diff --git a/components/BUILD.gn b/components/BUILD.gn index 2627e12..7dbcc52 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -30,6 +30,7 @@ group("all_components") { "//components/google/core/browser", "//components/search", "//components/search_engines", + "//components/sessions", "//components/sync_bookmarks", "//components/undo", "//components/strings", @@ -121,7 +122,6 @@ group("all_components") { "//components/resources:components_resources", "//components/search_provider_logos", "//components/security_interstitials/core", - "//components/sessions", "//components/signin/core/browser", "//components/ssl_config", "//components/startup_metric_utils", @@ -474,6 +474,8 @@ test("components_unittests") { "//components/policy/core/common:unit_tests", ] } + } else { + deps += [ "//components/sessions:unit_tests" ] } if (toolkit_views) { diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn index b9f043e..8d07d3b 100644 --- a/components/sessions/BUILD.gn +++ b/components/sessions/BUILD.gn @@ -51,11 +51,11 @@ if (!is_ios) { public_deps = [ ":shared", + "//ios/web", ] deps = [ "//base", - # '../ios/web/ios_web.gyp:ios_web', TODO(GYP) iOS. ] } } @@ -150,20 +150,29 @@ source_set("test_support") { } } -if (!is_ios && !is_android) { +if (!is_android) { source_set("unit_tests") { testonly = true sources = [ - "content/content_serialized_navigation_builder_unittest.cc", - "content/content_serialized_navigation_driver_unittest.cc", "core/serialized_navigation_entry_unittest.cc", "core/session_backend_unittest.cc", "core/session_types_unittest.cc", "ios/ios_serialized_navigation_builder_unittest.cc", "ios/ios_serialized_navigation_driver_unittest.cc", ] - deps = [ + + if (!is_ios) { + sources += [ + "content/content_serialized_navigation_builder_unittest.cc", + "content/content_serialized_navigation_driver_unittest.cc", + ] + } + + public_deps = [ ":sessions", + ] + + deps = [ ":test_support", "//base/test:test_support", "//testing/gtest", diff --git a/components/sync_driver/BUILD.gn b/components/sync_driver/BUILD.gn index a23d755..c19ff7d 100644 --- a/components/sync_driver/BUILD.gn +++ b/components/sync_driver/BUILD.gn @@ -234,8 +234,6 @@ source_set("unit_tests") { "//base:prefs_test_support", "//base/test:test_support", "//components/os_crypt", - "//components/policy", - "//components/policy:policy_component", "//components/pref_registry:test_support", "//components/version_info", "//net:test_support", @@ -248,5 +246,9 @@ source_set("unit_tests") { if (enable_configuration_policy) { sources += [ "sync_policy_handler_unittest.cc" ] + deps += [ + "//components/policy", + "//components/policy:policy_component", + ] } } diff --git a/net/BUILD.gn b/net/BUILD.gn index ae63eb7..65c9df3 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1465,12 +1465,14 @@ test("net_unittests") { "server/web_socket_encoder_unittest.cc", "websockets/websocket_basic_stream_test.cc", "websockets/websocket_channel_test.cc", + "websockets/websocket_deflate_parameters_test.cc", "websockets/websocket_deflate_predictor_impl_test.cc", "websockets/websocket_deflate_stream_test.cc", "websockets/websocket_deflater_test.cc", "websockets/websocket_end_to_end_test.cc", "websockets/websocket_errors_test.cc", "websockets/websocket_extension_parser_test.cc", + "websockets/websocket_extension_test.cc", "websockets/websocket_frame_parser_test.cc", "websockets/websocket_frame_test.cc", "websockets/websocket_handshake_challenge_test.cc", |