Remove is_chromeos_lacros gn build variable
Remove the last remaining uses of is_chromeos_lacros as well as the variable itself. FYI, the C++ build flag IS_CHROMEOS_LACROS has already been removed. Bug: b:354842935, b:365742770, 373971535 Change-Id: Iba15f2ee68e274bbccf1d58324b9a7cfd1765ea1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6275274 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Andrea Orru <andreaorru@chromium.org> Commit-Queue: Georg Neis <neis@chromium.org> Cr-Commit-Position: refs/heads/main@{#1426952}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
4a040b623d
commit
a324c50b3b
12
BUILD.gn
12
BUILD.gn
@ -517,7 +517,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
if (is_ios || is_win || is_linux || is_chromeos_lacros || is_fuchsia) {
|
||||
if (is_ios || is_win || is_linux || is_fuchsia) {
|
||||
deps += [
|
||||
"//base:base_i18n_perftests",
|
||||
"//google_apis:google_apis_unittests",
|
||||
@ -608,7 +608,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_android || is_linux || is_chromeos_lacros) {
|
||||
if (is_android || is_linux) {
|
||||
deps += [
|
||||
"//components/network_hints/browser",
|
||||
"//content/public/app",
|
||||
@ -622,7 +622,7 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_linux || is_chromeos_lacros) {
|
||||
if (is_linux) {
|
||||
deps += [
|
||||
"//skia:filter_fuzz_stub",
|
||||
"//skia:image_operations_bench",
|
||||
@ -749,14 +749,14 @@ group("gn_all") {
|
||||
deps += [ "//third_party/sqlite:sqlite_shell" ]
|
||||
}
|
||||
|
||||
if ((is_linux && !is_castos) || is_chromeos_lacros || is_fuchsia) {
|
||||
if ((is_linux && !is_castos) || is_fuchsia) {
|
||||
# TODO(https://crbug.com/1329673): Figure out if this should be in gn_all
|
||||
# and how cross-platform this is.
|
||||
deps +=
|
||||
[ "//components/services/filesystem:filesystem_service_unittests" ]
|
||||
}
|
||||
|
||||
if ((is_linux && !is_castos) || is_chromeos_lacros) {
|
||||
if (is_linux && !is_castos) {
|
||||
# TODO(https://crbug.com/1329673): Figure out if any of these should be in
|
||||
# gn_all and figure out how cross-platform they are.
|
||||
deps += [
|
||||
@ -1762,7 +1762,7 @@ group("chromium_builder_perf") {
|
||||
}
|
||||
}
|
||||
|
||||
if ((is_linux && !is_castos) || is_chromeos_lacros) {
|
||||
if (is_linux && !is_castos) {
|
||||
if (is_official_build) {
|
||||
# In GN builds, this is controlled by the 'linux_dump_symbols'
|
||||
# flag, which defaults to 1 for official builds. For now,
|
||||
|
@ -39,14 +39,6 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
|
||||
arm_use_thumb = true
|
||||
}
|
||||
|
||||
# For lacros build, we use ARM v8 by default.
|
||||
if (is_chromeos_lacros && arm_arch == "") {
|
||||
# TODO(crbug.com/40276884) Enable i8mm and dotprod instructions for ffmpeg
|
||||
# if ever we update to a version of arm that supports these instructions.
|
||||
arm_version = 8
|
||||
arm_arch = "armv8-a+crc"
|
||||
}
|
||||
|
||||
if (current_os == "android" || target_os == "android") {
|
||||
arm_float_abi = "softfp"
|
||||
} else {
|
||||
|
@ -5,25 +5,9 @@
|
||||
import("//build/config/chromeos/args.gni")
|
||||
|
||||
declare_args() {
|
||||
# Deprecated, use is_chromeos_lacros.
|
||||
#
|
||||
# This controls UI configuration for Chrome.
|
||||
# If this flag is set, we assume Chrome runs on Chrome OS devices, using
|
||||
# Wayland (instead of X11).
|
||||
#
|
||||
# TODO(crbug.com/40118868):
|
||||
# Define chromeos_product instead, which takes either "browser" or "ash".
|
||||
# Re-define the following variables as:
|
||||
# is_chromeos_lacros = chromeos_product == "browser"
|
||||
# is_chromeos_ash = chromeos_product == "ash"
|
||||
chromeos_is_browser_only = false
|
||||
}
|
||||
|
||||
# is_chromeos_{ash,lacros} is used to specify that it is specific to either
|
||||
# ash or lacros chrome for chromeos. For platform specific logic that
|
||||
# applies to both, use is_chromeos instead.
|
||||
# .gn files are evaluated multiple times for each toolchain.
|
||||
# is_chromeos_{ash,lacros} should be set true only for builds with target
|
||||
# toolchains.
|
||||
# THIS WHOLE FILE WILL BE DELETED.
|
||||
# Lacros is gone. There is only one kind of ChromeOS build. Use is_chromeos.
|
||||
is_chromeos_ash = is_chromeos && !chromeos_is_browser_only
|
||||
is_chromeos_lacros = is_chromeos && chromeos_is_browser_only
|
||||
|
@ -21,14 +21,14 @@ declare_args() {
|
||||
enable_check_raw_ptr_fields =
|
||||
build_with_chromium && !is_official_build &&
|
||||
((is_linux && !is_castos) || (is_android && !is_cast_android) || is_mac ||
|
||||
is_ios || is_win || is_chromeos_lacros || is_chromeos_ash)
|
||||
is_ios || is_win || is_chromeos_ash)
|
||||
|
||||
# TODO(crbug.com/40268473): Merge with enable_check_raw_ptr_fields once both
|
||||
# checks are activated on the same set of platforms.
|
||||
enable_check_raw_ref_fields =
|
||||
build_with_chromium && !is_official_build &&
|
||||
((is_linux && !is_castos) || (is_android && !is_cast_android) || is_win ||
|
||||
is_mac || is_ios || is_chromeos_lacros || is_chromeos_ash)
|
||||
is_mac || is_ios || is_chromeos_ash)
|
||||
|
||||
clang_base_path = default_clang_base_path
|
||||
|
||||
|
@ -1212,17 +1212,6 @@ config("compiler_cpu_abi") {
|
||||
"-m64",
|
||||
"-msse3",
|
||||
]
|
||||
|
||||
# Minimum SIMD support for devices running lacros.
|
||||
# See https://crbug.com/1475858
|
||||
if (is_chromeos_lacros) {
|
||||
cflags += [
|
||||
"-mssse3",
|
||||
"-msse4",
|
||||
"-msse4.1",
|
||||
"-msse4.2",
|
||||
]
|
||||
}
|
||||
ldflags += [ "-m64" ]
|
||||
} else if (current_cpu == "x86") {
|
||||
cflags += [ "-m32" ]
|
||||
@ -2278,8 +2267,7 @@ config("no_rtti") {
|
||||
# (de)allocate memory on a different heap, which would spell trouble if pointers
|
||||
# to heap-allocated memory are passed over shared library boundaries.
|
||||
config("export_dynamic") {
|
||||
# TODO(crbug.com/40118868): Revisit after target_os flip is completed.
|
||||
if (is_linux || is_chromeos_lacros || export_libcxxabi_from_executables) {
|
||||
if (is_linux || export_libcxxabi_from_executables) {
|
||||
ldflags = [ "-rdynamic" ]
|
||||
}
|
||||
}
|
||||
|
@ -30,8 +30,7 @@ declare_args() {
|
||||
# obsolete.
|
||||
(is_high_end_android || is_win || is_mac || is_fuchsia ||
|
||||
(is_linux && !is_castos) ||
|
||||
(is_ios && use_blink && target_environment == "device") ||
|
||||
(is_chromeos_lacros && is_chromeos_device))) {
|
||||
(is_ios && use_blink && target_environment == "device"))) {
|
||||
chrome_pgo_phase = 2
|
||||
}
|
||||
|
||||
|
@ -81,9 +81,6 @@ declare_args() {
|
||||
ozone_platform = "x11"
|
||||
ozone_platform_drm = true
|
||||
ozone_platform_x11 = true
|
||||
} else if (is_chromeos_lacros) {
|
||||
ozone_platform = "wayland"
|
||||
ozone_platform_wayland = true
|
||||
} else if (is_linux) {
|
||||
ozone_platform = "x11"
|
||||
ozone_platform_wayland = true
|
||||
|
@ -45,8 +45,7 @@ use_atk = use_glib && current_toolchain == default_toolchain
|
||||
|
||||
# Whether using Xvfb to provide a display server for a test might be
|
||||
# necessary.
|
||||
use_xvfb_in_this_config =
|
||||
is_linux || (is_chromeos_lacros && !is_chromeos_device)
|
||||
use_xvfb_in_this_config = is_linux
|
||||
#
|
||||
# =============================================
|
||||
# PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
|
||||
|
@ -74,7 +74,7 @@ if (concurrent_links == -1) {
|
||||
} else {
|
||||
_args = [ "--mem_per_link_gb=4" ]
|
||||
}
|
||||
} else if ((is_linux || is_chromeos_lacros) && symbol_level == 0) {
|
||||
} else if (is_linux && symbol_level == 0) {
|
||||
# Memory consumption on link without debug symbols is low on linux.
|
||||
_args = [ "--mem_per_link_gb=3" ]
|
||||
} else if (current_os == "zos") {
|
||||
|
@ -766,11 +766,6 @@ template("mojom") {
|
||||
"is_chromeos",
|
||||
"is_chromeos_ash",
|
||||
]
|
||||
} else if (is_chromeos_lacros) {
|
||||
enabled_features += [
|
||||
"is_chromeos",
|
||||
"is_chromeos_lacros",
|
||||
]
|
||||
} else if (is_fuchsia) {
|
||||
enabled_features += [ "is_fuchsia" ]
|
||||
} else if (is_ios) {
|
||||
|
2
third_party/minigbm/BUILD.gn
vendored
2
third_party/minigbm/BUILD.gn
vendored
@ -12,7 +12,7 @@ declare_args() {
|
||||
# Controls whether the build should use the version of minigbm library shipped
|
||||
# with the system. In release builds of desktop Linux and Chrome OS we use the
|
||||
# system version.
|
||||
use_system_minigbm = (is_linux && !is_castos) || is_chromeos_lacros
|
||||
use_system_minigbm = is_linux && !is_castos
|
||||
|
||||
use_amdgpu_minigbm = false
|
||||
use_exynos_minigbm = false
|
||||
|
2
third_party/tflite/BUILD.gn
vendored
2
third_party/tflite/BUILD.gn
vendored
@ -108,7 +108,7 @@ config("tflite_flags") {
|
||||
|
||||
if (build_tflite_with_ruy) {
|
||||
defines += [ "TFLITE_WITH_RUY" ]
|
||||
} else if (is_linux || is_chromeos_lacros) {
|
||||
} else if (is_linux) {
|
||||
defines += [ "GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK" ]
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user