Commit d7bd9ce1 authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

Move //chromeos/cryptohome from //chromeos public_deps

This moves //chromeos/cryptohome from //chromeos public_deps to deps
so that other components (chrome, ash, extensions, arc) must depend
on it explicitly.

This will also allow the dependency to be removed from src/ash.

For explicit dependency add to components/arc/BUILD.gn:
TBR=hidehiko@chromium.org

Bug: 918682
Change-Id: I660aedbdb04b4edd9f6308d27135be9d5aab8276
Reviewed-on: https://chromium-review.googlesource.com/c/1394865
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Reviewed-by: default avatarBen Wells <benwells@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619995}
parent 3457db5d
...@@ -1359,6 +1359,9 @@ component("ash") { ...@@ -1359,6 +1359,9 @@ component("ash") {
"//chromeos:power_manager_proto", "//chromeos:power_manager_proto",
"//chromeos/assistant:buildflags", "//chromeos/assistant:buildflags",
"//chromeos/components/multidevice/logging", "//chromeos/components/multidevice/logging",
# TODO(stevenjb): Remove cryptohome dependency. htps://crbug.com/918922.
"//chromeos/cryptohome",
"//chromeos/services/assistant/public:feature_flags", "//chromeos/services/assistant/public:feature_flags",
"//chromeos/services/assistant/public/mojom", "//chromeos/services/assistant/public/mojom",
"//chromeos/services/multidevice_setup/public/mojom", "//chromeos/services/multidevice_setup/public/mojom",
...@@ -2181,6 +2184,9 @@ static_library("test_support") { ...@@ -2181,6 +2184,9 @@ static_library("test_support") {
"//cc:test_support", "//cc:test_support",
"//chromeos", "//chromeos",
"//chromeos:test_support_without_gmock", "//chromeos:test_support_without_gmock",
# TODO(stevenjb): Remove cryptohome dependency. htps://crbug.com/918922.
"//chromeos/cryptohome",
"//components/account_id", "//components/account_id",
"//components/prefs:test_support", "//components/prefs:test_support",
"//components/user_manager:user_manager", "//components/user_manager:user_manager",
......
...@@ -73,6 +73,7 @@ source_set("api") { ...@@ -73,6 +73,7 @@ source_set("api") {
"//chrome:strings", "//chrome:strings",
"//chromeos/components/multidevice/logging", "//chromeos/components/multidevice/logging",
"//chromeos/components/proximity_auth", "//chromeos/components/proximity_auth",
"//chromeos/cryptohome",
"//components/account_id", "//components/account_id",
"//components/strings:components_strings_grit", "//components/strings:components_strings_grit",
"//components/user_manager", "//components/user_manager",
......
...@@ -24,15 +24,15 @@ source_set("music_manager_private") { ...@@ -24,15 +24,15 @@ source_set("music_manager_private") {
"//base", "//base",
"//chrome/common/apps/platform_apps/api", "//chrome/common/apps/platform_apps/api",
"//content/public/browser", "//content/public/browser",
"//crypto",
"//extensions/browser", "//extensions/browser",
"//rlz/buildflags", "//rlz/buildflags",
"//crypto",
] ]
if (is_chromeos) { if (is_chromeos) {
sources -= [ "device_id_linux.cc" ] sources -= [ "device_id_linux.cc" ]
deps += [ "//chromeos" ] deps += [ "//chromeos/cryptohome" ]
} }
if (enable_rlz_support) { if (enable_rlz_support) {
......
...@@ -95,6 +95,7 @@ source_set("chromeos") { ...@@ -95,6 +95,7 @@ source_set("chromeos") {
"//chromeos/components/multidevice/logging", "//chromeos/components/multidevice/logging",
"//chromeos/components/proximity_auth", "//chromeos/components/proximity_auth",
"//chromeos/components/tether", "//chromeos/components/tether",
"//chromeos/cryptohome",
"//chromeos/login/auth", "//chromeos/login/auth",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//chromeos/network", "//chromeos/network",
......
...@@ -956,6 +956,7 @@ jumbo_static_library("extensions") { ...@@ -956,6 +956,7 @@ jumbo_static_library("extensions") {
"//ash", "//ash",
"//ash/public/cpp", "//ash/public/cpp",
"//chromeos/components/proximity_auth", "//chromeos/components/proximity_auth",
"//chromeos/cryptohome",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//chromeos/services/ime/public/mojom", "//chromeos/services/ime/public/mojom",
"//chromeos/services/machine_learning/public/cpp", "//chromeos/services/machine_learning/public/cpp",
......
...@@ -1742,6 +1742,7 @@ jumbo_split_static_library("ui") { ...@@ -1742,6 +1742,7 @@ jumbo_split_static_library("ui") {
"//chromeos/components/multidevice/logging", "//chromeos/components/multidevice/logging",
"//chromeos/components/proximity_auth", "//chromeos/components/proximity_auth",
"//chromeos/components/tether", "//chromeos/components/tether",
"//chromeos/cryptohome",
"//chromeos/login/auth", "//chromeos/login/auth",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//chromeos/resources:resources_grit", "//chromeos/resources:resources_grit",
......
...@@ -31,7 +31,6 @@ component("chromeos") { ...@@ -31,7 +31,6 @@ component("chromeos") {
":chromeos_export", ":chromeos_export",
":policy_certificate_provider", ":policy_certificate_provider",
":tools", ":tools",
"//chromeos/cryptohome",
"//chromeos/dbus", "//chromeos/dbus",
"//chromeos/network", "//chromeos/network",
"//chromeos/settings", "//chromeos/settings",
...@@ -56,6 +55,7 @@ component("chromeos") { ...@@ -56,6 +55,7 @@ component("chromeos") {
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//chromeos/cryptohome",
"//chromeos/login/auth", "//chromeos/login/auth",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//components/account_id", "//components/account_id",
...@@ -66,6 +66,7 @@ component("chromeos") { ...@@ -66,6 +66,7 @@ component("chromeos") {
"//components/prefs", "//components/prefs",
"//components/user_manager", "//components/user_manager",
"//crypto:platform", "//crypto:platform",
"//dbus",
"//google_apis", "//google_apis",
"//media/base:video_facing", "//media/base:video_facing",
"//services/network/public/cpp:cpp", "//services/network/public/cpp:cpp",
...@@ -248,6 +249,7 @@ source_set("test_support_source_set") { ...@@ -248,6 +249,7 @@ source_set("test_support_source_set") {
"//chromeos/dbus:test_support", "//chromeos/dbus:test_support",
] ]
deps = [ deps = [
"//chromeos/cryptohome",
"//chromeos/login/auth:test_support", "//chromeos/login/auth:test_support",
"//chromeos/login/login_state:test_support", "//chromeos/login/login_state:test_support",
"//components/account_id", "//components/account_id",
...@@ -308,6 +310,7 @@ test("chromeos_unittests") { ...@@ -308,6 +310,7 @@ test("chromeos_unittests") {
":test_support", ":test_support",
":test_support_without_gmock", ":test_support_without_gmock",
"//base/test:test_support", "//base/test:test_support",
"//chromeos/cryptohome",
"//chromeos/cryptohome:unit_tests", "//chromeos/cryptohome:unit_tests",
"//chromeos/dbus:unit_tests", "//chromeos/dbus:unit_tests",
"//chromeos/login/auth:unit_tests", "//chromeos/login/auth:unit_tests",
......
...@@ -82,6 +82,7 @@ static_library("arc") { ...@@ -82,6 +82,7 @@ static_library("arc") {
"//chromeos", "//chromeos",
"//chromeos:login_manager_proto", "//chromeos:login_manager_proto",
"//chromeos:power_manager_proto", "//chromeos:power_manager_proto",
"//chromeos/cryptohome",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//components/account_id", "//components/account_id",
"//components/exo", "//components/exo",
...@@ -183,6 +184,7 @@ static_library("arc_base") { ...@@ -183,6 +184,7 @@ static_library("arc_base") {
"//base", "//base",
"//chromeos", "//chromeos",
"//chromeos:login_manager_proto", "//chromeos:login_manager_proto",
"//chromeos/cryptohome",
"//components/account_id", "//components/account_id",
"//components/keyed_service/content", "//components/keyed_service/content",
"//components/prefs", "//components/prefs",
...@@ -324,6 +326,7 @@ source_set("unit_tests") { ...@@ -324,6 +326,7 @@ source_set("unit_tests") {
"//chromeos", "//chromeos",
"//chromeos:power_manager_proto", "//chromeos:power_manager_proto",
"//chromeos:test_support_without_gmock", "//chromeos:test_support_without_gmock",
"//chromeos/cryptohome",
"//components/account_id", "//components/account_id",
"//components/keyed_service/content", "//components/keyed_service/content",
"//components/prefs:test_support", "//components/prefs:test_support",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment