Move remaining files from ash/components.
BUG=386148857 TEST=Tryjob Change-Id: Ie1dbdee3900d36619b0394aeed2fc88c26986434 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6219907 Reviewed-by: Mitsuru Oshima <oshima@chromium.org> Commit-Queue: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Cr-Commit-Position: refs/heads/main@{#1414829}
This commit is contained in:
Hidehiko Abe
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
863abd308f
commit
d145e34165
BUILD.gn
ash
buildtools/checkdeps
chromeos/ash/experiences
infra/config
generated
builders
ci
Linux Chromium OS ASan LSan Builder
targets
Linux Chromium OS ASan LSan Tests (1)
targets
Linux ChromiumOS MSan Builder
targets
Linux ChromiumOS MSan Tests
targets
linux-chromeos-code-coverage
targets
linux-chromeos-dbg-oslogin
targets
linux-chromeos-dbg
targets
linux-chromeos-rel
targets
try
linux-chromeos-code-coverage
targets
linux-chromeos-compile-dbg
targets
linux-chromeos-dbg-oslogin
targets
linux-chromeos-dbg
targets
linux-chromeos-rel
targets
linux_chromium_chromeos_asan_rel_ng
targets
linux_chromium_chromeos_msan_rel_ng
targets
testing
targets
testing/buildbot
2
BUILD.gn
2
BUILD.gn
@ -459,12 +459,12 @@ group("gn_all") {
|
||||
if (is_chromeos_ash) {
|
||||
deps += [
|
||||
"//ash:ash_unittests",
|
||||
"//ash/components:ash_components_unittests",
|
||||
"//ash/keyboard/ui:keyboard_unittests",
|
||||
"//ash/webui:ash_webui_unittests",
|
||||
"//chrome/browser/ash/child_accounts/time_limit_consistency_test:usage_time_limit_unittests",
|
||||
"//chrome/browser/metrics/perf:profile_provider_unittest",
|
||||
"//chromeos/ash/components/proximity_auth:proximity_auth_unittests",
|
||||
"//chromeos/ash/experiences:ash_components_unittests",
|
||||
"//chromeos/components:chromeos_components_unittests",
|
||||
"//components/exo/wayland:wayland_client_compatibility_tests",
|
||||
"//components/session_manager/core",
|
||||
|
||||
@ -10,7 +10,6 @@ Ash sits below chrome in the dependency graph (i.e. it cannot depend on code
|
||||
in //chrome). For historical reasons, ash has multiple dependency levels:
|
||||
|
||||
* General //ash code is on top (//ash/system, //ash/wm, etc.)
|
||||
* //ash/components sit below //ash, see [README](/ash/components/README.md)
|
||||
* //ash/constants sit near the bottom of the dependency graph, see
|
||||
[README](/ash/constants/README.md)
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# Code is migrating here from //chromeos/components, so share owners.
|
||||
# See go/lacros-directory-migration
|
||||
file://chromeos/components/OWNERS
|
||||
@ -1,16 +0,0 @@
|
||||
DEPRECATED. If you're about adding new component for ash-chrome only,
|
||||
consider using //chromeos/ash/components.
|
||||
|
||||
# About //ash/components
|
||||
|
||||
This directory contains components that are used by //ash system UI and window
|
||||
manager code. It sits "below" //ash in the dependency graph. For C++ code,
|
||||
think of //ash/components like top-level //components, but for code that is
|
||||
only used on ChromeOS, and only for system UI / window manager support.
|
||||
|
||||
Much of this code used to live in //chromeos/components. The
|
||||
[Lacros project](/docs/lacros.md) is extracting browser functionality into a
|
||||
separate binary. As part of this migration, code used only by the ash-chrome
|
||||
system UI binary moved into "ash" directories. See the
|
||||
[Chrome OS source directory migration](https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE/edit)
|
||||
design doc for details.
|
||||
@ -1,12 +1,14 @@
|
||||
# //ash/webui
|
||||
|
||||
DEPRECATED: please consider to use //chromeos/ash/experiences/..., instead.
|
||||
|
||||
//ash/webui contains code that is Chrome OS-specific WebUI for system web
|
||||
apps and has dependencies on //content.
|
||||
|
||||
General purpose window manager or system UI code should not have content
|
||||
dependencies, and should not live in this directory. Prefer a different
|
||||
top-level ash directory, like //ash/system, //ash/wm, or add
|
||||
//ash/your_feature. Low-level components go in //ash/components/your_feature.
|
||||
//ash/your_feature. Low-level components go in //chromeos/ash/components/your_feature.
|
||||
|
||||
Each subdirectory should be its own separate "module", and have its own
|
||||
BUILD.gn file. See this directory's [BUILD.gn file][1] for tips on adding
|
||||
|
||||
@ -75,8 +75,9 @@ specific_include_rules = {
|
||||
|
||||
You can optionally ignore the rules inherited from parent directories, similar
|
||||
to "set noparent" in OWNERS files. For example, adding `noparent = True` in
|
||||
//ash/components/DEPS will cause rules from //ash/DEPS to be ignored, thereby
|
||||
forcing each //ash/component/foo to explicitly declare foo's dependencies.
|
||||
//chromeos/ash/components/DEPS will cause rules from //chromeos/ash/DEPS
|
||||
to be ignored, thereby forcing each //ash/component/foo to explicitly declare
|
||||
foo's dependencies.
|
||||
|
||||
```
|
||||
noparent = True
|
||||
|
||||
@ -34,9 +34,9 @@ SPECIFIC_INCLUDE_RULES_VAR_NAME = 'specific_include_rules'
|
||||
SKIP_SUBDIRS_VAR_NAME = 'skip_child_includes'
|
||||
|
||||
# Optionally discard rules from parent directories, similar to "noparent" in
|
||||
# OWNERS files. For example, if //ash/components has "noparent = True" then
|
||||
# it will not inherit rules from //ash/DEPS, forcing each //ash/component/foo
|
||||
# to declare all its dependencies.
|
||||
# OWNERS files. For example, if //chromeos/ash/experiences has "noparent = True"
|
||||
# then it will not inherit rules from //chromeos/ash/DEPS, forcing each
|
||||
# //chromeos/ash/experiences/foo to declare all its dependencies.
|
||||
NOPARENT_VAR_NAME = 'noparent'
|
||||
|
||||
|
||||
|
||||
@ -2,14 +2,15 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
import("//build/config/chromeos/ui_mode.gni")
|
||||
import("//build/config/ui.gni")
|
||||
import("//testing/test.gni")
|
||||
|
||||
assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
|
||||
assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos/ash")
|
||||
|
||||
# To add a unit test to this target, make a "unit_test" source_set in your
|
||||
# component and add a reference here.
|
||||
# Note: For historical reasons, the name "ash_components_unittests" is kept,
|
||||
# rather than "chromeos_experiences_unittests".
|
||||
test("ash_components_unittests") {
|
||||
use_xvfb = use_xvfb_in_this_config
|
||||
|
||||
2
infra/config/generated/builders/ci/Linux Chromium OS ASan LSan Builder/targets/chromium.memory.json
2
infra/config/generated/builders/ci/Linux Chromium OS ASan LSan Builder/targets/chromium.memory.json
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"isolate_profile_data": true,
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"isolate_profile_data": true,
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
2
infra/config/generated/builders/try/linux_chromium_chromeos_asan_rel_ng/targets/chromium.memory.json
2
infra/config/generated/builders/try/linux_chromium_chromeos_asan_rel_ng/targets/chromium.memory.json
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
2
infra/config/generated/builders/try/linux_chromium_chromeos_msan_rel_ng/targets/chromium.memory.json
2
infra/config/generated/builders/try/linux_chromium_chromeos_msan_rel_ng/targets/chromium.memory.json
@ -90,7 +90,7 @@
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
"type": "windowed_test_launcher",
|
||||
},
|
||||
"ash_components_unittests": {
|
||||
"label": "//ash/components:ash_components_unittests",
|
||||
"label": "//chromeos/ash/experiences:ash_components_unittests",
|
||||
"type": "windowed_test_launcher",
|
||||
},
|
||||
"ash_pixeltests": {
|
||||
|
||||
@ -159,7 +159,7 @@ targets.binaries.windowed_test_launcher(
|
||||
|
||||
targets.binaries.windowed_test_launcher(
|
||||
name = "ash_components_unittests",
|
||||
label = "//ash/components:ash_components_unittests",
|
||||
label = "//chromeos/ash/experiences:ash_components_unittests",
|
||||
)
|
||||
|
||||
targets.binaries.windowed_test_launcher(
|
||||
|
||||
@ -2362,7 +2362,7 @@
|
||||
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
@ -261,7 +261,7 @@
|
||||
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "ash_components_unittests",
|
||||
"test_id_prefix": "ninja://ash/components:ash_components_unittests/"
|
||||
"test_id_prefix": "ninja://chromeos/ash/experiences:ash_components_unittests/"
|
||||
},
|
||||
{
|
||||
"merge": {
|
||||
|
||||
Reference in New Issue
Block a user