| Index: components/BUILD.gn
|
| diff --git a/components/BUILD.gn b/components/BUILD.gn
|
| index 935c2cfdf529c634d3930098848a34868537bb0f..4a9a57987f2168eb3bcd3af6f0bf74a5a5de7623 100644
|
| --- a/components/BUILD.gn
|
| +++ b/components/BUILD.gn
|
| @@ -4,6 +4,7 @@
|
|
|
| import("//build/config/features.gni")
|
| import("//build/config/ui.gni")
|
| +import("//build_overrides/webrtc.gni")
|
| import("//testing/test.gni")
|
| import("//tools/grit/repack.gni")
|
|
|
| @@ -46,45 +47,26 @@ test("components_unittests") {
|
| deps = [
|
| "//base",
|
| "//base/test:test_support",
|
| - "//components/autofill/core/browser:unit_tests",
|
| - "//components/autofill/core/common:unit_tests",
|
| "//components/bookmarks/browser:unit_tests",
|
| "//components/bookmarks/managed:unit_tests",
|
| - "//components/browser_sync/browser:unit_tests",
|
| "//components/compression:unit_tests",
|
| "//components/content_settings/core/browser:unit_tests",
|
| "//components/content_settings/core/common",
|
| "//components/content_settings/core/common:unit_tests",
|
| "//components/data_usage/core:unit_tests",
|
| "//components/dom_distiller/core:unit_tests",
|
| - "//components/enhanced_bookmarks:unit_tests",
|
| - "//components/favicon/core:unit_tests",
|
| - "//components/favicon_base:unit_tests",
|
| "//components/flags_ui:unit_tests",
|
| - "//components/gcm_driver:unit_tests",
|
| "//components/google/core/browser:unit_tests",
|
| - "//components/history/core/browser:unit_tests",
|
| - "//components/history/core/common:unit_tests",
|
| - "//components/invalidation/impl:unit_tests",
|
| "//components/keyed_service/core:unit_tests",
|
| "//components/leveldb_proto:unit_tests",
|
| "//components/metrics:unit_tests",
|
| "//components/net_log:unit_tests",
|
| "//components/network_time:unit_tests",
|
| - "//components/omnibox/browser:unit_tests",
|
| "//components/open_from_clipboard:unit_tests",
|
| "//components/os_crypt:unit_tests",
|
| - "//components/password_manager/core/browser:unit_tests",
|
| - "//components/password_manager/core/common:unit_tests",
|
| - "//components/password_manager/sync/browser:unit_tests",
|
| "//components/proxy_config:unit_tests",
|
| - "//components/rappor:unit_tests",
|
| - "//components/search:unit_tests",
|
| - "//components/search_engines:unit_tests",
|
| "//components/sessions:unit_tests",
|
| - "//components/signin/core/browser:unit_tests",
|
| "//components/suggestions:unit_tests",
|
| - "//components/sync_driver:unit_tests",
|
| "//components/syncable_prefs:unit_tests",
|
| "//components/translate/core/browser:unit_tests",
|
| "//components/translate/core/common:unit_tests",
|
| @@ -99,16 +81,16 @@ test("components_unittests") {
|
| "//testing/gtest",
|
| "//third_party/mojo/src/mojo/edk/embedder:headers",
|
| "//ui/base",
|
| - "//ui/gl:test_support",
|
| "//ui/resources:ui_test_pak",
|
| ]
|
|
|
| if (is_ios) {
|
| - deps += [
|
| - "//components/signin/ios/browser:unit_tests",
|
| - "//components/translate/ios/browser:unit_tests",
|
| - "//components/webp_transcode:unit_tests",
|
| - ]
|
| + deps += [ "//components/translate/ios/browser:unit_tests" ]
|
| +
|
| + if (target_cpu != "arm") {
|
| + # TODO(GYP): iOS arm builds of libwebp don't work yet.
|
| + deps += [ "//components/webp_transcode:unit_tests" ]
|
| + }
|
| } else { # !iOS
|
| deps += [
|
| "//components/auto_login_parser:unit_tests",
|
| @@ -174,6 +156,7 @@ test("components_unittests") {
|
| # These are the deps required by the code in this target.
|
| "//components/policy:policy_component",
|
| "//content/test:test_support",
|
| + "//ui/gl:test_support",
|
| ]
|
|
|
| data_deps = [
|
| @@ -242,6 +225,33 @@ test("components_unittests") {
|
| ]
|
| }
|
|
|
| + if (!is_ios || ios_use_webrtc) {
|
| + deps += [
|
| + "//components/autofill/core/browser:unit_tests",
|
| + "//components/autofill/core/common:unit_tests",
|
| + "//components/browser_sync/browser:unit_tests",
|
| + "//components/enhanced_bookmarks:unit_tests",
|
| + "//components/favicon/core:unit_tests",
|
| + "//components/favicon_base:unit_tests",
|
| + "//components/gcm_driver:unit_tests",
|
| + "//components/history/core/browser:unit_tests",
|
| + "//components/history/core/common:unit_tests",
|
| + "//components/invalidation/impl:unit_tests",
|
| + "//components/omnibox/browser:unit_tests",
|
| + "//components/password_manager/core/browser:unit_tests",
|
| + "//components/password_manager/core/common:unit_tests",
|
| + "//components/password_manager/sync/browser:unit_tests",
|
| + "//components/rappor:unit_tests",
|
| + "//components/search:unit_tests",
|
| + "//components/signin/core/browser:unit_tests",
|
| + "//components/sync_driver:unit_tests",
|
| + ]
|
| + }
|
| +
|
| + if (ios_use_webrtc) {
|
| + deps += [ "//components/signin/ios/browser:unit_tests" ]
|
| + }
|
| +
|
| if (toolkit_views) {
|
| # TODO bug 522654 Enable this when the undefined symbol is fixed in
|
| # web_modal such that this links.
|
| @@ -436,6 +446,7 @@ test("components_perftests") {
|
| "//base/test:test_support",
|
| "//testing/gtest",
|
| "//testing/perf",
|
| + "//url",
|
| ]
|
| if (!is_ios) {
|
| deps += [
|
|
|