chromium/src
0
Fork 0
Code Activity

Stop building src/chrome on Fuchsia.

Browse Source 
I added asserts that Fuchsia isn't turned on in src/chrome build files and worked backwards.

To followup we can simplify the build files in chrome to remove Fuchsia statements.

Bug: 1509109
Change-Id: I20eacf6dfd0e15cec0c57f917eef903b071524ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5238017
Reviewed-by: Zijie He <zijiehe@google.com>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Devlin Cronin <rdevlin.cronin@chromium.org>
Reviewed-by: David Song <wintermelons@google.com>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1253012}
This commit is contained in:
John Abd-El-Malek
2024-01-27 05:54:11 +00:00
committed by Chromium LUCI CQ
parent aa953911d9
commit 6eb6dededd
17 changed files with 44 additions and 114 deletions

5
BUILD.gn

@ -19,7 +19,6 @@ import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build/gn_logs.gni")
import("//build/util/generate_wrapper.gni")
import("//chrome/browser/buildflags.gni")
import("//components/enterprise/buildflags/buildflags.gni")
import("//components/nacl/features.gni")
import("//device/vr/buildflags/buildflags.gni")
@ -46,6 +45,8 @@ if (is_fuchsia) {
import("//build/config/fuchsia/generate_runner_scripts.gni")
import("//third_party/fuchsia-gn-sdk/src/component.gni")
import("//third_party/fuchsia-gn-sdk/src/package.gni")
} else {
import("//chrome/browser/buildflags.gni")
}
if (is_linux) {
@ -161,7 +162,7 @@ group("gn_all") {
deps += [ "//chrome/installer" ]
}
if (enable_updater) {
if (!is_fuchsia && enable_updater) {
deps += [ "//chrome/updater" ]
}

4
chrome/BUILD.gn

@ -31,6 +31,10 @@ import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
import("//ui/gl/features.gni")
import("//v8/gni/v8.gni")
assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome")
# TODO(jam): remove is_fuchsia below
if (is_android) {
import("//build/config/android/rules.gni")
} else if (is_linux || is_chromeos) {

4
chrome/browser/BUILD.gn

@ -56,6 +56,10 @@ if (is_win) {
import("//build/config/win/manifest.gni")
}
assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome")
# TODO(jam): remove is_fuchsia below
declare_args() {
# You can set the variable 'use_official_enterprise_connectors_api_keys' to
# true to use the Google-internal file containing official API keys

15
chrome/test/BUILD.gn

@ -55,6 +55,9 @@ import("//ui/webui/webui_features.gni")
import("//v8/gni/v8.gni")
assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome")
# TODO(jam): remove is_fuchsia below
if (is_android) {
import("//build/config/android/rules.gni")
@ -1073,17 +1076,7 @@ if (is_android) {
telemetry_target_suffix = _target_suffix
}
}
} else if (is_fuchsia) {
group("telemetry_gpu_integration_test_fuchsia") {
testonly = true
data = [ "//content/test/gpu/run_gpu_integration_test_fuchsia.py" ]
data_deps = [
"//content/test:fuchsia_telemetry_test_data",
"//content/test:telemetry_gpu_integration_test_support",
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
]
}
} else {
} else if (!is_fuchsia) {
group("telemetry_gpu_integration_test") {
testonly = true
data_deps = [

12
content/test/BUILD.gn

@ -3493,3 +3493,15 @@ group("gpu_pytype") {
"//testing:pytype_dependencies",
]
}
if (is_fuchsia) {
group("telemetry_gpu_integration_test_fuchsia") {
testonly = true
data = [ "//content/test/gpu/run_gpu_integration_test_fuchsia.py" ]
data_deps = [
"//content/test:fuchsia_telemetry_test_data",
"//content/test:telemetry_gpu_integration_test_support",
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
]
}
}

3
extensions/BUILD.gn

@ -10,6 +10,9 @@ import("//tools/grit/repack.gni")
import("//ui/base/ui_features.gni")
assert(enable_extensions)
assert(!is_fuchsia, "Fuchsia shouldn't use anything in //extensions")
# TODO(jam): remove is_fuchsia below
if (is_component_build) {
component("extensions") {

2
extensions/buildflags/buildflags.gni

@ -5,6 +5,6 @@
import("//build/config/cast.gni")
declare_args() {
enable_extensions = !is_android && !is_ios && !is_castos
enable_extensions = !is_android && !is_ios && !is_castos && !is_fuchsia
enable_extensions_legacy_ipc = false
}

2
infra/config/generated/testing/gn_isolate_map.pyl

@ -1580,7 +1580,7 @@
],
},
"telemetry_gpu_integration_test_fuchsia": {
"label": "//chrome/test:telemetry_gpu_integration_test_fuchsia",
"label": "//content/test:telemetry_gpu_integration_test_fuchsia",
"type": "script",
"script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
"args": [

1
infra/config/generated/testing/test_suites.pyl

@ -2163,7 +2163,6 @@
'fuchsia_chrome_small_gtests': {
'courgette_unittests': {},
'extensions_unittests': {},
'headless_unittests': {},
'message_center_unittests': {},
'views_examples_unittests': {

1
infra/config/targets/basic_suites.star

@ -1926,7 +1926,6 @@ targets.legacy_basic_suite(
name = "fuchsia_chrome_small_gtests",
tests = {
"courgette_unittests": targets.legacy_test_config(),
"extensions_unittests": targets.legacy_test_config(),
"headless_unittests": targets.legacy_test_config(),
"message_center_unittests": targets.legacy_test_config(),
"views_examples_unittests": targets.legacy_test_config(

2
infra/config/targets/binaries.star

@ -1692,7 +1692,7 @@ targets.binaries.script(
targets.binaries.script(
name = "telemetry_gpu_integration_test_fuchsia",
label = "//chrome/test:telemetry_gpu_integration_test_fuchsia",
label = "//content/test:telemetry_gpu_integration_test_fuchsia",
script = "//testing/scripts/run_gpu_integration_test_as_googletest.py",
args = [
"../../content/test/gpu/run_gpu_integration_test_fuchsia.py",

20
testing/buildbot/chromium.coverage.json

@ -8939,26 +8939,6 @@
"test": "events_unittests",
"test_id_prefix": "ninja://ui/events:events_unittests/"
},
{
"args": [
"--code-coverage-dir=${ISOLATED_OUTDIR}",
"--device-spec=virtual_device_large"
],
"isolate_profile_data": true,
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "extensions_unittests",
"swarming": {
"dimensions": {
"os": "Ubuntu-22.04"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "extensions_unittests",
"test_id_prefix": "ninja://extensions:extensions_unittests/"
},
{
"args": [
"--code-coverage-dir=${ISOLATED_OUTDIR}",

33
testing/buildbot/chromium.fuchsia.fyi.json

@ -1328,24 +1328,6 @@
"test": "events_unittests",
"test_id_prefix": "ninja://ui/events:events_unittests/"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.extensions_unittests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "extensions_unittests",
"swarming": {
"dimensions": {
"kvm": "1",
"os": "Ubuntu-22.04"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "extensions_unittests",
"test_id_prefix": "ninja://extensions:extensions_unittests/"
},
{
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@ -2370,21 +2352,6 @@
"test": "events_unittests",
"test_id_prefix": "ninja://ui/events:events_unittests/"
},
{
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "extensions_unittests",
"swarming": {
"dimensions": {
"kvm": "1",
"os": "Ubuntu-22.04"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "extensions_unittests",
"test_id_prefix": "ninja://extensions:extensions_unittests/"
},
{
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"

47
testing/buildbot/chromium.fuchsia.json

@ -2385,22 +2385,6 @@
"test": "events_unittests",
"test_id_prefix": "ninja://ui/events:events_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "extensions_unittests",
"swarming": {
"dimensions": {
"kvm": "1",
"os": "Ubuntu-22.04"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "extensions_unittests",
"test_id_prefix": "ninja://extensions:extensions_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
@ -3159,7 +3143,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -3199,7 +3183,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -3230,7 +3214,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -3261,7 +3245,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
}
]
},
@ -3680,21 +3664,6 @@
"test": "events_unittests",
"test_id_prefix": "ninja://ui/events:events_unittests/"
},
{
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "extensions_unittests",
"swarming": {
"dimensions": {
"kvm": "1",
"os": "Ubuntu-22.04"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "extensions_unittests",
"test_id_prefix": "ninja://extensions:extensions_unittests/"
},
{
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@ -4410,7 +4379,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -4449,7 +4418,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -4479,7 +4448,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
},
{
"args": [
@ -4509,7 +4478,7 @@
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "telemetry_gpu_integration_test_fuchsia",
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_fuchsia/"
"test_id_prefix": "ninja://content/test:telemetry_gpu_integration_test_fuchsia/"
}
]
}

2
testing/buildbot/gn_isolate_map.pyl

@ -1580,7 +1580,7 @@
],
},
"telemetry_gpu_integration_test_fuchsia": {
"label": "//chrome/test:telemetry_gpu_integration_test_fuchsia",
"label": "//content/test:telemetry_gpu_integration_test_fuchsia",
"type": "script",
"script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
"args": [

1
testing/buildbot/test_suites.pyl

@ -2163,7 +2163,6 @@
'fuchsia_chrome_small_gtests': {
'courgette_unittests': {},
'extensions_unittests': {},
'headless_unittests': {},
'message_center_unittests': {},
'views_examples_unittests': {

4
ui/accessibility/platform/BUILD.gn

@ -94,9 +94,9 @@ component("platform") {
"//ui/display",
]
if (enable_extensions) {
if (enable_extensions || is_fuchsia) {
sources += [
# Use by the Automation API.
# Use by the Automation API and the Accessibility service.
# TODO(crbug.com/1357889): Rename to atp/ or javascript/?
"automation/automation_api_util.cc",
"automation/automation_api_util.h",