Commit a72ff528 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Enable "gn check" for //third_party/blink/renderer/modules/{cache_storage,service_worker}

This CL updates all of circular dependencies with
modules/service_worker:service_worker so that:
  - modules/service_worker:service_worker depends on other sub-modules
  - We allow circular includes from the sub-modules.

It simplifies the management of |allow_circular_includes_from| significantly.

Bug: 800764
Change-Id: Ie804d8ed1abebce65459e1f7408394d8783ef8fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2400218Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805259}
parent 60b33bf2
...@@ -251,13 +251,11 @@ no_check_targets = [ ...@@ -251,13 +251,11 @@ no_check_targets = [
"//third_party/blink/renderer/core/workers:*", # 289 errors "//third_party/blink/renderer/core/workers:*", # 289 errors
"//third_party/blink/renderer/core/xmlhttprequest:*", # 49 errors "//third_party/blink/renderer/core/xmlhttprequest:*", # 49 errors
"//third_party/blink/renderer/core:*", # 823 errors "//third_party/blink/renderer/core:*", # 823 errors
"//third_party/blink/renderer/modules/cache_storage:*", # 3 errors
"//third_party/blink/renderer/modules/canvas:*", # 1 error "//third_party/blink/renderer/modules/canvas:*", # 1 error
"//third_party/blink/renderer/modules/font_access:*", # 3 errors "//third_party/blink/renderer/modules/font_access:*", # 3 errors
"//third_party/blink/renderer/modules/manifest:*", # 2 errors "//third_party/blink/renderer/modules/manifest:*", # 2 errors
"//third_party/blink/renderer/modules/media_capabilities:*", # 5 errors "//third_party/blink/renderer/modules/media_capabilities:*", # 5 errors
"//third_party/blink/renderer/modules/peerconnection:*", # 43 errors "//third_party/blink/renderer/modules/peerconnection:*", # 43 errors
"//third_party/blink/renderer/modules/service_worker:*", # 23 errors
"//third_party/blink/renderer/modules/webcodecs:*", # 13 errors "//third_party/blink/renderer/modules/webcodecs:*", # 13 errors
"//third_party/blink/renderer/modules/webtransport:*", # 16 errors "//third_party/blink/renderer/modules/webtransport:*", # 16 errors
"//third_party/blink/renderer/modules:*", # 321 errors "//third_party/blink/renderer/modules:*", # 321 errors
......
...@@ -27,7 +27,6 @@ blink_modules_sources("background_fetch") { ...@@ -27,7 +27,6 @@ blink_modules_sources("background_fetch") {
"service_worker_registration_background_fetch.h", "service_worker_registration_background_fetch.h",
] ]
public_deps = [ "//third_party/blink/renderer/modules/service_worker" ]
deps = [ deps = [
"//third_party/blink/renderer/modules/cache_storage:cache_storage", "//third_party/blink/renderer/modules/cache_storage:cache_storage",
"//third_party/blink/renderer/modules/manifest:manifest", "//third_party/blink/renderer/modules/manifest:manifest",
......
...@@ -18,5 +18,4 @@ blink_modules_sources("background_sync") { ...@@ -18,5 +18,4 @@ blink_modules_sources("background_sync") {
"sync_manager.cc", "sync_manager.cc",
"sync_manager.h", "sync_manager.h",
] ]
deps = [ "//third_party/blink/renderer/modules/service_worker" ]
} }
...@@ -18,5 +18,4 @@ blink_modules_sources("content_index") { ...@@ -18,5 +18,4 @@ blink_modules_sources("content_index") {
"service_worker_registration_content_index.cc", "service_worker_registration_content_index.cc",
"service_worker_registration_content_index.h", "service_worker_registration_content_index.h",
] ]
deps = [ "//third_party/blink/renderer/modules/service_worker" ]
} }
...@@ -22,8 +22,5 @@ blink_modules_sources("cookie_store") { ...@@ -22,8 +22,5 @@ blink_modules_sources("cookie_store") {
"service_worker_registration_cookies.h", "service_worker_registration_cookies.h",
] ]
deps = [ deps = [ "//third_party/blink/renderer/platform" ]
"//third_party/blink/renderer/modules/service_worker",
"//third_party/blink/renderer/platform",
]
} }
...@@ -21,7 +21,6 @@ blink_modules_sources("exported") { ...@@ -21,7 +21,6 @@ blink_modules_sources("exported") {
"//third_party/blink/renderer/modules/crypto", "//third_party/blink/renderer/modules/crypto",
"//third_party/blink/renderer/modules/filesystem", "//third_party/blink/renderer/modules/filesystem",
"//third_party/blink/renderer/modules/mediastream", "//third_party/blink/renderer/modules/mediastream",
"//third_party/blink/renderer/modules/service_worker",
"//ui/accessibility:ax_enums_mojo_blink", "//ui/accessibility:ax_enums_mojo_blink",
] ]
} }
......
...@@ -25,7 +25,6 @@ blink_modules_sources("notifications") { ...@@ -25,7 +25,6 @@ blink_modules_sources("notifications") {
deps = [ deps = [
"//services/resource_coordinator/public/cpp:resource_coordinator_cpp", "//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
"//third_party/blink/renderer/modules/permissions", "//third_party/blink/renderer/modules/permissions",
"//third_party/blink/renderer/modules/service_worker",
"//third_party/blink/renderer/modules/vibration", "//third_party/blink/renderer/modules/vibration",
] ]
} }
...@@ -70,6 +70,5 @@ blink_modules_sources("payments") { ...@@ -70,6 +70,5 @@ blink_modules_sources("payments") {
"//components/payments/mojom:mojom_blink", "//components/payments/mojom:mojom_blink",
"//third_party/blink/renderer/modules/credentialmanager", "//third_party/blink/renderer/modules/credentialmanager",
"//third_party/blink/renderer/modules/permissions", "//third_party/blink/renderer/modules/permissions",
"//third_party/blink/renderer/modules/service_worker",
] ]
} }
...@@ -39,6 +39,5 @@ blink_modules_sources("push_messaging") { ...@@ -39,6 +39,5 @@ blink_modules_sources("push_messaging") {
deps = [ deps = [
"//third_party/blink/renderer/modules/manifest", "//third_party/blink/renderer/modules/manifest",
"//third_party/blink/renderer/modules/permissions", "//third_party/blink/renderer/modules/permissions",
"//third_party/blink/renderer/modules/service_worker",
] ]
} }
...@@ -64,5 +64,17 @@ blink_modules_sources("service_worker") { ...@@ -64,5 +64,17 @@ blink_modules_sources("service_worker") {
public_deps = [ "//third_party/blink/renderer/platform" ] public_deps = [ "//third_party/blink/renderer/platform" ]
deps = [ "//base" ] deps_in_modules = [
"//third_party/blink/renderer/modules/background_fetch:background_fetch",
"//third_party/blink/renderer/modules/background_sync:background_sync",
"//third_party/blink/renderer/modules/cache_storage:cache_storage",
"//third_party/blink/renderer/modules/content_index:content_index",
"//third_party/blink/renderer/modules/cookie_store:cookie_store",
"//third_party/blink/renderer/modules/notifications:notifications",
"//third_party/blink/renderer/modules/exported:exported",
"//third_party/blink/renderer/modules/payments:payments",
"//third_party/blink/renderer/modules/push_messaging:push_messaging",
]
deps = [ "//base" ] + deps_in_modules
allow_circular_includes_from = deps_in_modules
} }
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