chromium/src
0
Fork 0
Code Activity

Replace usage of is_chromeos_ash with is_chromeos in rlz.

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

Bug: 373972275
Change-Id: Ia9b9d44e8931c8afd37ae87478297873f054d617
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6320336
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1428074}
This commit is contained in:
Yuta Hijikata
2025-03-04 17:05:48 -08:00
committed by Chromium LUCI CQ
parent 1321d3763d
commit fe12a1c0c1
2 changed files with 6 additions and 8 deletions

9
rlz/BUILD.gn

@ -5,7 +5,6 @@
# Note that this build file assumes rlz_use_chrome_net which is a condition in
# the GYP file, but is always true for Chrome builds.
import("//build/config/chromeos/ui_mode.gni")
import("//rlz/buildflags/buildflags.gni")
import("//testing/test.gni")
@ -75,7 +74,7 @@ if (enable_rlz_support) {
"//build:chromeos_buildflags",
]
if (is_chromeos_ash) {
if (is_chromeos) {
sources += [
"chromeos/lib/rlz_value_store_chromeos.cc",
"chromeos/lib/rlz_value_store_chromeos.h",
@ -135,7 +134,7 @@ if (enable_rlz_support) {
"//url",
]
if (is_chromeos_ash) {
if (is_chromeos) {
deps += [
"//chromeos/ash/components/dbus",
"//chromeos/ash/components/system",
@ -158,7 +157,7 @@ if (enable_rlz_support) {
":rlz_lib",
"//build:chromeos_buildflags",
]
if (is_chromeos_ash) {
if (is_chromeos) {
public_deps += [ "//chromeos/ash/components/system" ]
}
}
@ -192,7 +191,7 @@ if (enable_rlz_support) {
"//testing/gtest",
"//third_party/zlib",
]
if (is_chromeos_ash) {
if (is_chromeos) {
deps += [
"//chromeos/ash/components/dbus:test_support",
"//chromeos/ash/components/dbus/debug_daemon",

5
rlz/buildflags/buildflags.gni

@ -3,15 +3,14 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
# Whether we are using the rlz library or not. Platforms like Android send
# rlz codes for searches but do not use the library.
enable_rlz_support = is_win || is_apple || is_chromeos_ash
enable_rlz_support = is_win || is_apple || is_chromeos
declare_args() {
enable_rlz = is_chrome_branded && enable_rlz_support
}
assert(!enable_rlz || enable_rlz_support,
"RLZ is only supported on Windows, Apple and ChromeOS Ash.")
"RLZ is only supported on Windows, Apple and ChromeOS.")