chromium/src
0
Fork 0
Code Activity

GN checks: Add apps-related projects to check_targets for GN

Browse Source 
Fix all GN issues and add the following to GN check_targets:
 //apps/*
 //chrome/browser/apps/*
 //chrome/browser/web_applications/*
to make `gn check` working again.

Drive by: Extract web_applications:browser_tests source set in GN.

TBR=dpranke@chromium.org

Bug: 367595
Change-Id: I8704d4893554fc4028c09d681871a05bc56ddbcf
Reviewed-on: https://chromium-review.googlesource.com/1182902
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585333}
This commit is contained in:
Alexey Baskakov
2018-08-23 00:28:09 +00:00
committed by Commit Bot
parent 1f16f5b898
commit 3f6c31f0fd
14 changed files with 101 additions and 8 deletions
.gn
apps
BUILD.gn
chrome
browser
BUILD.gn
apps
app_shim
BUILD.gn
foundation
app_service
BUILD.gn
platform_apps
BUILD.gn
chromeos
BUILD.gn
extensions
BUILD.gn
ui
BUILD.gn
web_applications
BUILD.gn
bookmark_apps
BUILD.gn
components
BUILD.gn
extensions
BUILD.gn
test
BUILD.gn

8
.gn

@ -74,7 +74,7 @@ default_args = {
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
check_targets = [
#"//apps/*", # Medium-hard.
"//apps/*",
"//ash/*",
"//base/*",
"//blink/*",
@ -90,8 +90,7 @@ check_targets = [
"//chrome/browser/accessibility/*",
"//chrome/browser/android/*",
"//chrome/browser/app_mode/*",
#"//chrome/browser/apps/*", # 2 errors
"//chrome/browser/apps/*",
"//chrome/browser/assist_ranker/*",
"//chrome/browser/autocomplete/*",
"//chrome/browser/autofill/*",
@ -225,8 +224,7 @@ check_targets = [
"//chrome/browser/upgrade_detector/*",
"//chrome/browser/usb/*",
"//chrome/browser/vr/*",
#"//chrome/browser/web_applications/*", # 66 errors
"//chrome/browser/web_applications/*",
"//chrome/browser/webauthn/*",
"//chrome/browser/webshare/*",
"//chrome/browser/win/*",

1
apps/BUILD.gn

@ -62,5 +62,6 @@ static_library("test_support") {
public_deps = [
"//content/public/browser",
"//extensions/browser",
]
}

8
chrome/browser/BUILD.gn

@ -3219,6 +3219,7 @@ jumbo_split_static_library("browser") {
}
if (is_mac) {
allow_circular_includes_from += [ "//chrome/browser/apps/app_shim" ]
deps += [
"//chrome/app_shim",
"//chrome/browser/apps/app_shim",
@ -3831,11 +3832,18 @@ jumbo_split_static_library("browser") {
allow_circular_includes_from += [
"//chrome/browser/apps/platform_apps",
"//chrome/browser/extensions",
"//chrome/browser/web_applications",
"//chrome/browser/web_applications/bookmark_apps",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
]
deps += [
"//apps",
"//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
"//chrome/browser/web_applications",
"//chrome/browser/web_applications/bookmark_apps",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
"//chrome/common/extensions/api",
"//chrome/common/extensions/api:extensions_features",
"//components/drive",

11
chrome/browser/apps/app_shim/BUILD.gn

@ -21,7 +21,18 @@ source_set("app_shim") {
]
deps = [
"//apps",
"//chrome/browser/apps/platform_apps",
"//chrome/browser/extensions",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
"//chrome/common",
"//chrome/common:app_mode_app_support",
"//chrome/common:constants",
"//chrome/common:mojo_bindings",
"//chrome/common:non_code_constants",
"//components/crx_file",
"//components/version_info",
"//content/public/browser",
"//content/public/common",
"//extensions/browser",

1
chrome/browser/apps/foundation/app_service/BUILD.gn

@ -16,6 +16,7 @@ source_set("lib") {
deps = [
"//base",
"//components/pref_registry",
"//components/prefs",
"//mojo/public/cpp/bindings",
"//services/preferences/public/cpp",

1
chrome/browser/apps/platform_apps/BUILD.gn

@ -42,6 +42,7 @@ source_set("platform_apps") {
"//chrome/app:command_ids",
"//chrome/browser/extensions",
"//chrome/browser/media/router/discovery",
"//chrome/browser/web_applications/extensions",
"//chrome/common",
"//components/crx_file",
"//components/keyed_service/content",

6
chrome/browser/chromeos/BUILD.gn

@ -67,6 +67,7 @@ source_set("chromeos") {
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//chrome/browser/ssl:proto",
"//chrome/browser/web_applications",
"//chrome/browser/web_applications/bookmark_apps",
"//chrome/browser/web_applications/components",
"//chrome/common",
"//chrome/common/extensions/api",
@ -244,7 +245,10 @@ source_set("chromeos") {
":dbus_service_files",
]
allow_circular_includes_from = [ "//chrome/browser/extensions" ]
allow_circular_includes_from = [
"//chrome/browser/extensions",
"//chrome/browser/web_applications/bookmark_apps",
]
sources = [
"accessibility/accessibility_extension_loader.cc",

4
chrome/browser/extensions/BUILD.gn

@ -771,6 +771,10 @@ jumbo_static_library("extensions") {
]
defines = []
# TODO(loyso): Remove this circular dependency. http://crbug.com/876576.
allow_circular_includes_from =
[ "//chrome/browser/web_applications/extensions" ]
# Since browser and browser_extensions actually depend on each other,
# we must omit the dependency from browser_extensions to browser.
# However, this means browser_extensions and browser should more or less

2
chrome/browser/ui/BUILD.gn

@ -2488,6 +2488,8 @@ jumbo_split_static_library("ui") {
sources += cocoa_browser_sources
allow_circular_includes_from += [ "//chrome/browser/apps/app_shim" ]
deps += [
"//chrome/app/nibs:localizer_table",
"//chrome/browser/apps/app_shim",

13
chrome/browser/web_applications/BUILD.gn

@ -17,7 +17,11 @@ source_set("web_applications") {
deps = [
":web_app_group",
"//chrome/browser/web_applications/bookmark_apps",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
"//chrome/common",
"//components/keyed_service/content",
"//extensions/browser",
]
}
@ -31,3 +35,12 @@ source_set("unit_tests") {
"//chrome/browser/web_applications/extensions:unit_tests",
]
}
source_set("browser_tests") {
testonly = true
deps = [
":web_app_group",
"//chrome/browser/web_applications/extensions:browser_tests",
]
}

12
chrome/browser/web_applications/bookmark_apps/BUILD.gn

@ -19,7 +19,11 @@ source_set("bookmark_apps") {
deps = [
"//chrome/browser/extensions",
"//chrome/browser/web_applications:web_app_group",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/extensions",
"//chrome/common",
"//components/favicon/content",
"//components/pref_registry",
"//skia",
]
}
@ -34,9 +38,17 @@ source_set("unit_tests") {
deps = [
":bookmark_apps",
"//base",
"//chrome/browser",
"//chrome/browser/web_applications:web_app_group",
"//chrome/browser/web_applications/components",
"//chrome/browser/web_applications/components:test_support",
"//chrome/common:constants",
"//components/sync_preferences:test_support",
"//content/test:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//url",
]
}

9
chrome/browser/web_applications/components/BUILD.gn

@ -39,14 +39,18 @@ source_set("components") {
}
deps = [
"//chrome/app/resources:platform_locale_settings",
"//chrome/app/theme:chrome_unscaled_resources",
"//chrome/browser/web_applications:web_app_group",
"//chrome/common",
"//components/crx_file",
"//components/favicon/content",
"//content/public/browser",
"//skia",
]
}
static_library("test_support") {
source_set("test_support") {
testonly = true
sources = [
@ -57,6 +61,7 @@ static_library("test_support") {
deps = [
":components",
"//base",
"//url",
]
}
@ -78,8 +83,10 @@ source_set("unit_tests") {
deps = [
":components",
"//base/test:test_support",
"//chrome/app/theme:theme_resources",
"//chrome/browser/web_applications:web_app_group",
"//chrome/test:test_support",
"//content/public/browser",
"//skia",
"//testing/gmock",

31
chrome/browser/web_applications/extensions/BUILD.gn

@ -32,6 +32,7 @@ source_set("extensions") {
"//chrome/browser/web_applications/components",
"//chrome/common",
"//content/public/browser",
"//extensions/browser",
"//skia",
]
}
@ -48,10 +49,40 @@ source_set("unit_tests") {
deps = [
":extensions",
"//chrome/browser",
"//chrome/browser/web_applications:web_app_group",
"//chrome/browser/web_applications/components",
"//chrome/common",
"//chrome/test:test_support",
"//content/public/browser",
"//content/test:test_support",
"//extensions/browser/install",
"//extensions/common",
"//skia",
"//testing/gtest",
]
}
source_set("browser_tests") {
testonly = true
sources = [
"pending_bookmark_app_manager_browsertest.cc",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [
":extensions",
"//base/test:test_support",
"//chrome/browser",
"//chrome/browser/ui",
"//chrome/browser/web_applications",
"//chrome/browser/web_applications:web_app_group",
"//chrome/browser/web_applications/components",
"//chrome/test:test_support_ui",
"//extensions/browser",
"//extensions/common",
"//net:test_support",
]
}

2
chrome/test/BUILD.gn

@ -934,7 +934,6 @@ test("browser_tests") {
"../browser/ui/zoom/zoom_controller_browsertest.cc",
"../browser/unload_browsertest.cc",
"../browser/usb/usb_browsertest.cc",
"../browser/web_applications/extensions/pending_bookmark_app_manager_browsertest.cc",
"../browser/web_bluetooth_browsertest.cc",
"../common/mac/app_mode_chrome_locator_browsertest.mm",
"../common/mac/mock_launchd.cc",
@ -994,6 +993,7 @@ test("browser_tests") {
"//chrome:strings",
"//chrome/browser",
"//chrome/browser/devtools:test_support",
"//chrome/browser/web_applications:browser_tests",
"//chrome/renderer",
"//chrome/services/removable_storage_writer:lib",
"//components/autofill/content/browser:risk_proto",