Index: components/BUILD.gn |
diff --git a/components/BUILD.gn b/components/BUILD.gn |
index b24ef8e89a7e5855eb5a25844c7d425c5ed2b408..8088094a9dfaf4f1095a38d1b92f728a2f64e355 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") |
@@ -18,8 +19,6 @@ group("all_components") { |
visibility = [ "//:*" ] # Only for the root targets to bring in. |
deps = [ |
- "//components/autofill/core/browser", |
- "//components/autofill/core/common", |
"//components/bookmarks/browser", |
"//components/bookmarks/common", |
"//components/bookmarks/managed", |
@@ -44,12 +43,7 @@ group("all_components") { |
"//components/favicon_base", |
"//components/gcm_driver", |
"//components/google/core/browser", |
- "//components/history/core/browser", |
- "//components/history/core/common", |
- "//components/history/core/test", |
"//components/infobars/core", |
- "//components/invalidation/impl", |
- "//components/invalidation/public", |
"//components/keyed_service/core", |
"//components/leveldb_proto", |
"//components/metrics", |
@@ -59,9 +53,6 @@ group("all_components") { |
"//components/omnibox/browser", |
"//components/open_from_clipboard", |
"//components/os_crypt", |
- "//components/password_manager/core/browser", |
- "//components/password_manager/core/common", |
- "//components/password_manager/sync/browser", |
"//components/pref_registry", |
"//components/proxy_config", |
"//components/rappor", |
@@ -71,8 +62,6 @@ group("all_components") { |
"//components/signin/core/browser", |
"//components/strings", |
"//components/suggestions", |
- "//components/sync_bookmarks", |
- "//components/sync_driver", |
"//components/syncable_prefs", |
"//components/translate/core/browser", |
"//components/translate/core/common", |
@@ -84,7 +73,6 @@ group("all_components") { |
"//components/version_info", |
"//components/version_ui", |
"//components/web_resource", |
- "//components/webdata_services", |
] |
if (!is_ios) { |
@@ -242,7 +230,6 @@ group("all_components") { |
} |
} else { |
deps += [ |
- "//components/autofill/ios/browser", |
"//components/dom_distiller/ios", |
"//components/history/ios/browser", |
"//components/keyed_service/ios", |
@@ -252,6 +239,25 @@ group("all_components") { |
] |
} |
+ if (!is_ios || ios_use_webrtc) { |
+ deps += [ |
+ "//components/autofill/core/browser", |
+ "//components/autofill/core/common", |
+ "//components/autofill/ios/browser", |
+ "//components/history/core/browser", |
+ "//components/history/core/common", |
+ "//components/history/core/test", |
+ "//components/invalidation/impl", |
+ "//components/invalidation/public", |
+ "//components/password_manager/core/browser", |
+ "//components/password_manager/core/common", |
+ "//components/password_manager/sync/browser", |
+ "//components/sync_bookmarks", |
+ "//components/sync_driver", |
+ "//components/webdata_services", |
+ ] |
+ } |
+ |
if (toolkit_views) { |
deps += [ "//components/constrained_window" ] |
} |
@@ -351,8 +357,6 @@ 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/compression:unit_tests", |
@@ -365,9 +369,6 @@ test("components_unittests") { |
"//components/favicon_base: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", |
@@ -376,17 +377,12 @@ test("components_unittests") { |
"//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", |
@@ -529,6 +525,21 @@ test("components_unittests") { |
deps += [ |
"//components/signin/ios/browser:unit_tests", |
"//components/translate/ios/browser:unit_tests", |
+ ] |
+ } |
+ |
+ if (!is_ios || ios_use_webrtc) { |
+ deps += [ |
+ "//components/autofill/core/browser:unit_tests", |
+ "//components/autofill/core/common:unit_tests", |
+ "//components/history/core/browser:unit_tests", |
+ "//components/history/core/common:unit_tests", |
+ "//components/invalidation/impl: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/sync_driver:unit_tests", |
"//components/webp_transcode:unit_tests", |
] |
} |