Fix //chrome:* build dependencies and enable GN check
Targets in //chrome:* had several unspecified dependencies that were still linked in by other listed dependencies. The targets linked correctly, but GN checked failed for these targets. This CL adds all dependencies explicitly and re-enables GN check for these targets. Bug: 949535 Change-Id: I9855b68e5616164cddad54c7ac49bd44eecd024c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422347 Commit-Queue: Collin Baker <collinbaker@chromium.org> Reviewed-by: Robert Sesek <rsesek@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Cr-Commit-Position: refs/heads/master@{#811303}
This commit is contained in:
1
.gn
1
.gn
@@ -86,7 +86,6 @@ no_check_targets = [
|
|||||||
"//chrome/test/data/nacl:*", # 350 errors
|
"//chrome/test/data/nacl:*", # 350 errors
|
||||||
"//chrome/test/media_router:*", # 5 errors
|
"//chrome/test/media_router:*", # 5 errors
|
||||||
"//chrome/test:*", # 2682 errors
|
"//chrome/test:*", # 2682 errors
|
||||||
"//chrome:*", # 7 errors
|
|
||||||
|
|
||||||
"//clank/third_party/gvr_shim:*", # 1 error
|
"//clank/third_party/gvr_shim:*", # 1 error
|
||||||
"//extensions/browser/api/alarms:*", # 2 errors
|
"//extensions/browser/api/alarms:*", # 2 errors
|
||||||
|
@@ -3,6 +3,7 @@
|
|||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
import("//build/config/chrome_build.gni")
|
import("//build/config/chrome_build.gni")
|
||||||
|
import("//build/config/chromeos/ui_mode.gni")
|
||||||
import("//build/config/compiler/compiler.gni")
|
import("//build/config/compiler/compiler.gni")
|
||||||
import("//build/config/features.gni")
|
import("//build/config/features.gni")
|
||||||
import("//build/config/locales.gni")
|
import("//build/config/locales.gni")
|
||||||
@@ -164,23 +165,28 @@ if (!is_android && !is_mac) {
|
|||||||
"//chrome/app/version_assembly:chrome_exe_manifest",
|
"//chrome/app/version_assembly:chrome_exe_manifest",
|
||||||
"//chrome/browser:active_use_util",
|
"//chrome/browser:active_use_util",
|
||||||
"//chrome/browser:chrome_process_finder",
|
"//chrome/browser:chrome_process_finder",
|
||||||
|
"//chrome/browser/policy:path_parser",
|
||||||
"//chrome/chrome_elf",
|
"//chrome/chrome_elf",
|
||||||
"//chrome/common:constants",
|
"//chrome/common:constants",
|
||||||
|
"//chrome/install_static:install_static_util",
|
||||||
"//chrome/install_static:secondary_module",
|
"//chrome/install_static:secondary_module",
|
||||||
"//chrome/installer/util:constants",
|
"//chrome/installer/util:constants",
|
||||||
"//chrome/installer/util:did_run_support",
|
"//chrome/installer/util:did_run_support",
|
||||||
"//components/browser_watcher:browser_watcher_client",
|
"//components/browser_watcher:browser_watcher_client",
|
||||||
|
"//components/crash/core/app",
|
||||||
"//components/crash/core/app:run_as_crashpad_handler",
|
"//components/crash/core/app:run_as_crashpad_handler",
|
||||||
"//components/crash/core/common",
|
"//components/crash/core/common",
|
||||||
"//components/flags_ui:switches",
|
"//components/flags_ui:switches",
|
||||||
"//content:sandbox_helper_win",
|
"//content:sandbox_helper_win",
|
||||||
"//content/public/common:static_switches",
|
"//content/public/common:static_switches",
|
||||||
"//crypto",
|
"//crypto",
|
||||||
|
"//gpu/command_buffer/service",
|
||||||
"//sandbox",
|
"//sandbox",
|
||||||
"//sandbox/policy",
|
"//sandbox/policy",
|
||||||
"//third_party/breakpad:breakpad_handler",
|
"//third_party/breakpad:breakpad_handler",
|
||||||
"//third_party/breakpad:breakpad_sender",
|
"//third_party/breakpad:breakpad_sender",
|
||||||
"//third_party/crashpad/crashpad/util",
|
"//third_party/crashpad/crashpad/util",
|
||||||
|
"//ui/gl",
|
||||||
]
|
]
|
||||||
data_deps = [
|
data_deps = [
|
||||||
"//chrome/app/version_assembly:version_assembly_manifest",
|
"//chrome/app/version_assembly:version_assembly_manifest",
|
||||||
@@ -338,6 +344,7 @@ if (is_win) {
|
|||||||
"//headless:headless_shell_browser_lib",
|
"//headless:headless_shell_browser_lib",
|
||||||
"//net:net_resources",
|
"//net:net_resources",
|
||||||
"//ppapi/buildflags",
|
"//ppapi/buildflags",
|
||||||
|
"//sandbox/win:sandbox",
|
||||||
"//third_party/cld_3/src/src:cld_3",
|
"//third_party/cld_3/src/src:cld_3",
|
||||||
"//third_party/wtl",
|
"//third_party/wtl",
|
||||||
"//ui/views",
|
"//ui/views",
|
||||||
@@ -938,7 +945,6 @@ if (is_win) {
|
|||||||
deps = [
|
deps = [
|
||||||
":browser_dependencies",
|
":browser_dependencies",
|
||||||
":child_dependencies",
|
":child_dependencies",
|
||||||
"//build:chromeos_buildflags",
|
|
||||||
"//chrome/app:command_ids",
|
"//chrome/app:command_ids",
|
||||||
"//chrome/common:buildflags",
|
"//chrome/common:buildflags",
|
||||||
"//chrome/common/profiler",
|
"//chrome/common/profiler",
|
||||||
@@ -1168,11 +1174,18 @@ if (is_win) {
|
|||||||
|
|
||||||
group("browser_dependencies") {
|
group("browser_dependencies") {
|
||||||
public_deps = [
|
public_deps = [
|
||||||
|
"//build:branding_buildflags",
|
||||||
|
"//build:chromeos_buildflags",
|
||||||
|
"//chrome/app:shutdown_signal_handlers",
|
||||||
"//chrome/browser",
|
"//chrome/browser",
|
||||||
|
"//chrome/browser/policy:path_parser",
|
||||||
"//chrome/common",
|
"//chrome/common",
|
||||||
|
"//components/crash/core/app",
|
||||||
"//components/gwp_asan/buildflags",
|
"//components/gwp_asan/buildflags",
|
||||||
"//components/heap_profiling/in_process",
|
"//components/heap_profiling/in_process",
|
||||||
|
"//components/startup_metric_utils/browser",
|
||||||
"//components/sync",
|
"//components/sync",
|
||||||
|
"//components/upload_list:upload_list",
|
||||||
"//services/tracing/public/cpp",
|
"//services/tracing/public/cpp",
|
||||||
]
|
]
|
||||||
if (enable_plugins) {
|
if (enable_plugins) {
|
||||||
@@ -1190,6 +1203,23 @@ group("browser_dependencies") {
|
|||||||
public_deps += [ "//components/gwp_asan/client" ]
|
public_deps += [ "//components/gwp_asan/client" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (enable_nacl) {
|
||||||
|
public_deps += [ "//components/nacl/browser" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chromeos_is_browser_only) {
|
||||||
|
public_deps += [ "//chromeos/lacros" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_chromeos) {
|
||||||
|
public_deps += [
|
||||||
|
"//chrome/browser/chromeos",
|
||||||
|
"//chromeos",
|
||||||
|
"//chromeos/constants",
|
||||||
|
"//chromeos/memory",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_component_build) {
|
if (!is_component_build) {
|
||||||
assert_no_deps = [
|
assert_no_deps = [
|
||||||
# Blink should not be used in the browser process. In component build this
|
# Blink should not be used in the browser process. In component build this
|
||||||
@@ -1227,6 +1257,7 @@ group("child_dependencies") {
|
|||||||
"//services/tracing/public/cpp",
|
"//services/tracing/public/cpp",
|
||||||
"//third_party/blink/public:blink_devtools_frontend_resources",
|
"//third_party/blink/public:blink_devtools_frontend_resources",
|
||||||
"//third_party/blink/public:blink_devtools_inspector_resources",
|
"//third_party/blink/public:blink_devtools_inspector_resources",
|
||||||
|
"//v8:v8_headers",
|
||||||
]
|
]
|
||||||
|
|
||||||
if (enable_nacl) {
|
if (enable_nacl) {
|
||||||
@@ -1499,6 +1530,8 @@ if (is_android) {
|
|||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
|
":browser_dependencies",
|
||||||
|
":child_dependencies",
|
||||||
"//chrome/browser/ui",
|
"//chrome/browser/ui",
|
||||||
"//chrome/child",
|
"//chrome/child",
|
||||||
"//chrome/common",
|
"//chrome/common",
|
||||||
@@ -1509,6 +1542,7 @@ if (is_android) {
|
|||||||
"//components/heap_profiling/in_process",
|
"//components/heap_profiling/in_process",
|
||||||
"//components/minidump_uploader",
|
"//components/minidump_uploader",
|
||||||
"//components/safe_browsing:buildflags",
|
"//components/safe_browsing:buildflags",
|
||||||
|
"//components/safe_browsing/android:safe_browsing_api_handler",
|
||||||
"//components/safe_browsing/android:safe_browsing_mobile",
|
"//components/safe_browsing/android:safe_browsing_mobile",
|
||||||
"//components/services/heap_profiling",
|
"//components/services/heap_profiling",
|
||||||
"//content/public/app",
|
"//content/public/app",
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
#include "chrome/common/chrome_version.h"
|
#include "chrome/common/chrome_version.h"
|
||||||
|
|
||||||
#if defined(HELPER_EXECUTABLE)
|
#if defined(HELPER_EXECUTABLE)
|
||||||
#include "sandbox/mac/seatbelt_exec.h"
|
#include "sandbox/mac/seatbelt_exec.h" // nogncheck
|
||||||
#endif // defined(HELPER_EXECUTABLE)
|
#endif // defined(HELPER_EXECUTABLE)
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
Reference in New Issue
Block a user