0

Replace usage of is_chromeos_ash with is_chromeos in tools.

This is part of Lacros sunset. Since Lacros is gone, the two variables
mean the same thing.

Note that args for generated_script, deploy_lacros was removed in
crrev.com/c/5933926.

Bug: 373972275
Change-Id: I840e8b9d188fc4fb8fd5d4c66a1da5449c758dbb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6320699
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/main@{#1428073}
This commit is contained in:
Yuta Hijikata
2025-03-04 17:04:13 -08:00
committed by Chromium LUCI CQ
parent 8f4e6c1289
commit 1321d3763d
7 changed files with 20 additions and 36 deletions
tools

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/devtools.gni")
import("//build/config/ui.gni")
@ -24,7 +23,7 @@ _grit_defines = [
"SHARED_INTERMEDIATE_DIR=" + shared_intermediate_dir,
"_google_chrome=${is_chrome_branded}",
"_is_chrome_for_testing_branded=${is_chrome_for_testing_branded}",
"chromeos_ash=${is_chromeos_ash}",
"chromeos_ash=${is_chromeos}",
# This is related to Chrome OS.
"reven=${is_reven}",

@ -2,7 +2,6 @@
# 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/sanitizers/sanitizers.gni")
executable("ipc_fuzzer") {
@ -28,7 +27,7 @@ executable("ipc_fuzzer") {
"//tools/ipc_fuzzer/message_lib:ipc_message_lib",
]
public_deps = [ "//ipc" ]
if (is_asan && is_chromeos_ash) {
if (is_asan && is_chromeos) {
# Compiling fuzzer.cc with ASan takes too long, see
# http://crbug.com/360158.
configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ]

@ -19,12 +19,7 @@ if (is_chromeos_device) {
generate_runner_script("cros_update_wrapper") {
generated_script = "$root_build_dir/bin/cros_update_wrapper"
if (is_chromeos_ash) {
deploy_chrome = true
} else {
deploy_lacros = true
skip_generating_board_args = true
}
deploy_chrome = true
}
}
@ -86,7 +81,7 @@ group("telemetry_chrome_test") {
data_deps += [ ":cros_update_wrapper" ]
}
if (is_chromeos_ash && is_chromeos_device) {
if (is_chromeos && is_chromeos_device) {
data_deps += [
"//:chromiumos_preflight",
"//chromeos:cros_chrome_deploy",

@ -2,10 +2,8 @@
# 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")
# Note: Don't use html_to_js() in new code. Instead see html_to_wrapper()
assert(is_chromeos_ash)
assert(is_chromeos)
template("html_to_js") {
action(target_name) {

@ -5,7 +5,7 @@
import("//build/config/chromeos/ui_mode.gni")
import("//third_party/node/node.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
template("ts_definitions") {
node(target_name) {
@ -83,25 +83,20 @@ template("ts_definitions") {
"//resources/polymer/v3_0/polymer/polymer_bundled.min.js|" + rebase_path(
"//third_party/polymer/v3_0/components-chromium/polymer/polymer-element.d.ts",
target_gen_dir),
"chrome://resources/cros_components/*|" + rebase_path(
"$root_gen_dir/ui/webui/resources/tsc/cros_components/to_be_rewritten/*",
target_gen_dir),
"//resources/cros_components/*|" + rebase_path(
"$root_gen_dir/ui/webui/resources/tsc/cros_components/to_be_rewritten/*",
target_gen_dir),
"chrome://resources/ash/common/*|" +
rebase_path("$root_gen_dir/ash/webui/common/resources/preprocessed/*",
target_gen_dir),
"//resources/ash/common/*|" +
rebase_path("$root_gen_dir/ash/webui/common/resources/preprocessed/*",
target_gen_dir),
]
if (is_chromeos_ash) {
path_mappings += [
"chrome://resources/cros_components/*|" + rebase_path(
"$root_gen_dir/ui/webui/resources/tsc/cros_components/to_be_rewritten/*",
target_gen_dir),
"//resources/cros_components/*|" + rebase_path(
"$root_gen_dir/ui/webui/resources/tsc/cros_components/to_be_rewritten/*",
target_gen_dir),
"chrome://resources/ash/common/*|" + rebase_path(
"$root_gen_dir/ash/webui/common/resources/preprocessed/*",
target_gen_dir),
"//resources/ash/common/*|" + rebase_path(
"$root_gen_dir/ash/webui/common/resources/preprocessed/*",
target_gen_dir),
]
}
args += [ "--path_mappings" ] + path_mappings
if (defined(invoker.path_mappings)) {
args += invoker.path_mappings

@ -2,7 +2,6 @@
# 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("//third_party/node/node.gni")
template("ts_library") {
@ -162,7 +161,7 @@ template("ts_library") {
"--platform",
platform,
]
} else if (is_chromeos_ash) {
} else if (is_chromeos) {
platform = "chromeos_ash"
args += [
"--platform",

@ -2,7 +2,6 @@
# 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("//third_party/node/node.gni")
template("webui_path_mappings") {
@ -53,7 +52,7 @@ template("webui_path_mappings") {
"--platform",
platform,
]
} else if (is_chromeos_ash) {
} else if (is_chromeos) {
platform = "chromeos_ash"
args += [
"--platform",