| Index: ios/web/BUILD.gn
|
| diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn
|
| index 3701f47e686a023aca3f1aba03928dc4645f0e30..0e5eacd049aa0a18be7cedcd0655f80aee50fea1 100644
|
| --- a/ios/web/BUILD.gn
|
| +++ b/ios/web/BUILD.gn
|
| @@ -2,6 +2,13 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +# GN build of //ios/web only supports building with the web implementation of
|
| +# WebThread as opposed to GYP build that allow using a shim implementation based
|
| +# on top of BrowserThread.
|
| +#
|
| +# See ios/web/ios_web.gyp for more information on how gyp supports this. The
|
| +# gn targets will fold the target selection in the gyp "incomplete" targets.
|
| +
|
| import("//testing/test.gni")
|
| import("//ios/web/js_compile.gni")
|
|
|
| @@ -20,6 +27,9 @@ config("config") {
|
|
|
| source_set("web") {
|
| deps = [
|
| + ":core",
|
| + ":js_resources",
|
| + ":user_agent",
|
| "//base",
|
| "//components/url_formatter",
|
| "//ios/net",
|
| @@ -30,9 +40,6 @@ source_set("web") {
|
| "//ui/gfx/geometry:geometry",
|
| "//ui/resources",
|
| "//url",
|
| - ":core",
|
| - ":js_resources",
|
| - ":user_agent",
|
| ]
|
|
|
| sources = [
|
| @@ -329,6 +336,7 @@ source_set("test_support") {
|
| "//ios/third_party/gcdwebserver",
|
| "//testing/gmock",
|
| "//testing/gtest",
|
| + "//third_party/google_toolbox_for_mac",
|
| "//third_party/ocmock",
|
| ":web",
|
| ]
|
| @@ -376,14 +384,15 @@ test("ios_web_unittests") {
|
| deps = [
|
| "//base",
|
| "//base/test:test_support",
|
| - "//ios/testing:ocmock_support",
|
| "//net:test_support",
|
| "//testing/gmock",
|
| "//testing/gtest",
|
| + "//third_party/google_toolbox_for_mac",
|
| "//third_party/ocmock",
|
| "//ui/base:test_support",
|
| - ":test_support",
|
| + "//ios/testing:ocmock_support",
|
| ":web",
|
| + ":test_support",
|
| ]
|
|
|
| sources = [
|
| @@ -399,7 +408,6 @@ test("ios_web_unittests") {
|
| "navigation/navigation_item_impl_unittest.mm",
|
| "navigation/navigation_manager_impl_unittest.mm",
|
| "navigation/nscoder_util_unittest.mm",
|
| - "net/cert_host_pair_unittest.cc",
|
| "net/cert_policy_unittest.cc",
|
| "net/cert_verifier_block_adapter_unittest.cc",
|
| "net/clients/crw_csp_network_client_unittest.mm",
|
| @@ -411,6 +419,7 @@ test("ios_web_unittests") {
|
| "net/request_tracker_impl_unittest.mm",
|
| "net/web_http_protocol_handler_delegate_unittest.mm",
|
| "public/referrer_util_unittest.cc",
|
| + "public/test/http_server_unittest.mm",
|
| "string_util_unittest.cc",
|
| "test/crw_fake_web_controller_observer_unittest.mm",
|
| "test/run_all_unittests.cc",
|
|
|