[Fuchsia] Further remove fuchsia targets from chrome/ folders
After this change, https://crrev.com/c/5120471 should be green. The default diff is very misleading, most of the change in chrome/test/BUILD.gn is the indentation. Selecting "ignore whitespace" to reduce the diff. Or navigate to https://goonlinetools.com/online-clipboard/#4293. Bug: 1509109, 1490426 Change-Id: Ia546a928f9e92d9fc2bd247664e9024d7d2e6f16 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5120922 Reviewed-by: John Abd-El-Malek <jam@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: Zijie He <zijiehe@google.com> Reviewed-by: David Song <wintermelons@google.com> Cr-Commit-Position: refs/heads/main@{#1237678}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
50c64c3aad
commit
d995cb0e46
48
BUILD.gn
48
BUILD.gn
@ -133,11 +133,15 @@ group("gn_all") {
|
||||
}
|
||||
|
||||
if (!is_ios && !is_android && !is_castos) {
|
||||
if (!is_fuchsia) {
|
||||
deps += [
|
||||
"//chrome",
|
||||
"//chrome/browser/ui/actions:dump_actions",
|
||||
"//chrome/browser/ui/color:dump_colors",
|
||||
"//chrome/test:browser_tests",
|
||||
]
|
||||
}
|
||||
deps += [
|
||||
"//chrome",
|
||||
"//chrome/browser/ui/actions:dump_actions",
|
||||
"//chrome/browser/ui/color:dump_colors",
|
||||
"//chrome/test:browser_tests",
|
||||
"//components/subresource_filter/tools:subresource_filter_tools",
|
||||
"//components/zucchini:zucchini",
|
||||
"//gpu/gles2_conform_support:gles2_conform_test",
|
||||
@ -152,7 +156,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
if (!is_castos) {
|
||||
if (!is_castos && !is_fuchsia) {
|
||||
deps += [ "//chrome/installer" ]
|
||||
}
|
||||
|
||||
@ -172,10 +176,10 @@ group("gn_all") {
|
||||
}
|
||||
|
||||
if (!is_ios && !is_castos) {
|
||||
deps += [
|
||||
"//chrome/test:unit_tests",
|
||||
"//ui/accessibility:accessibility_unittests",
|
||||
]
|
||||
if (!is_fuchsia) {
|
||||
deps += [ "//chrome/test:unit_tests" ]
|
||||
}
|
||||
deps += [ "//ui/accessibility:accessibility_unittests" ]
|
||||
}
|
||||
|
||||
if (use_blink) {
|
||||
@ -241,7 +245,7 @@ group("gn_all") {
|
||||
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
|
||||
]
|
||||
if (!is_android) {
|
||||
if (!is_castos) {
|
||||
if (!is_castos && !is_fuchsia) {
|
||||
deps += [ "//chrome/test:telemetry_perf_unittests" ]
|
||||
}
|
||||
} else {
|
||||
@ -527,7 +531,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
if (!is_android && !is_castos && !is_ios) {
|
||||
if (!is_android && !is_castos && !is_ios && !is_fuchsia) {
|
||||
deps += [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:sync_performance_tests",
|
||||
@ -1614,8 +1618,6 @@ group("chromium_builder_perf") {
|
||||
|
||||
if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
||||
data_deps = [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:performance_test_suite",
|
||||
"//components/tracing:tracing_perftests",
|
||||
"//gpu:command_buffer_perftests",
|
||||
"//gpu:gpu_perftests",
|
||||
@ -1623,7 +1625,14 @@ group("chromium_builder_perf") {
|
||||
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
|
||||
]
|
||||
|
||||
if (!is_chromeos_ash && !(is_fuchsia && optimize_for_size)) {
|
||||
if (!is_fuchsia) {
|
||||
data_deps += [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:performance_test_suite",
|
||||
]
|
||||
}
|
||||
|
||||
if (!is_chromeos_ash && !is_fuchsia) {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
@ -1651,13 +1660,6 @@ group("chromium_builder_perf") {
|
||||
"//third_party/angle/src/tests:angle_perftests",
|
||||
]
|
||||
}
|
||||
|
||||
# An `if (is_fuchsia)` condition in //chrome/test/BUILD.gn prevents this
|
||||
# target from being defined.
|
||||
# TODO(crbug.com/1310086): Resolve that and remove this exception.
|
||||
if (is_fuchsia) {
|
||||
data_deps -= [ "//chrome/test:performance_test_suite" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
||||
@ -1665,11 +1667,13 @@ if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
||||
testonly = true
|
||||
|
||||
deps = [
|
||||
"//chrome:chrome",
|
||||
"//content/shell:content_shell",
|
||||
"//third_party/blink/public/mojom:mojom_modules_js",
|
||||
"//v8:d8",
|
||||
]
|
||||
if (!is_fuchsia) {
|
||||
deps += [ "//chrome:chrome" ]
|
||||
}
|
||||
if (!is_win) {
|
||||
deps += [ "//skia:filter_fuzz_stub" ]
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ group("assert_no_deps") {
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//chrome/android:chrome_public_apk" ]
|
||||
} else {
|
||||
} else if (!is_fuchsia) {
|
||||
deps += [ ":chrome" ]
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ group("assert_no_deps") {
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_android && !is_mac) {
|
||||
if (!is_android && !is_mac && !is_fuchsia) {
|
||||
group("chrome") {
|
||||
public_deps = [ ":chrome_initial" ]
|
||||
data_deps = [ ":chrome_initial" ]
|
||||
|
@ -247,31 +247,3 @@ static_library("test_support") {
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (is_fuchsia) {
|
||||
# Generate a packaged component, and an installer script to aid development.
|
||||
|
||||
fuchsia_component("chrome_component") {
|
||||
visibility = [ ":*" ]
|
||||
manifest = "chrome.cml"
|
||||
data_deps = [ "//chrome:chrome_initial" ]
|
||||
}
|
||||
|
||||
fuchsia_package("chrome_pkg") {
|
||||
package_name = "chrome"
|
||||
deps = [ ":chrome_component" ]
|
||||
|
||||
excluded_dirs = FUCHSIA_PACKAGED_CONTENT_EMBEDDER_EXCLUDED_DIRS
|
||||
}
|
||||
|
||||
fuchsia_package_installer("chrome_fuchsia") {
|
||||
visibility = [
|
||||
":*", # See https://crbug.com/1328459#c4.
|
||||
"//:gn_all",
|
||||
"//chrome/test/*",
|
||||
"//content/test/*",
|
||||
]
|
||||
package = ":chrome_pkg"
|
||||
package_name = "chrome"
|
||||
}
|
||||
}
|
||||
|
8264
chrome/test/BUILD.gn
8264
chrome/test/BUILD.gn
File diff suppressed because it is too large
Load Diff
@ -823,9 +823,6 @@ if (is_fuchsia) {
|
||||
"//testing:run_perf_test",
|
||||
"//tools/perf/:perf",
|
||||
]
|
||||
if (!optimize_for_size) {
|
||||
data_deps += [ "//chrome/test:sync_performance_tests" ]
|
||||
}
|
||||
}
|
||||
group("fuchsia_telemetry_test_data") {
|
||||
testonly = true
|
||||
|
Reference in New Issue
Block a user