0

Rewrite is_linux flag for content and components directories.

This migrates is_linux (which is also set for chromeos) to explicitly
include chromeos as is_linux || is_chromeos in preparation for
separating those flags.

Bug: 1110266
Change-Id: I50f2e8769c8687a3c90d653010f2d92c7d70d0b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2325769
Commit-Queue: Sean McAllister <smcallis@google.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793313}
This commit is contained in:
Sean McAllister
2020-07-30 20:05:52 +00:00
committed by Commit Bot
parent 6997d30b09
commit 8ccdb76479
30 changed files with 62 additions and 62 deletions
components
BUILD.gn
crash
content
browser
core
cronet
exo
gwp_asan
metrics
nacl
browser
common
loader
BUILD.gn
sandbox_linux
policy
safe_browsing
core
resources
services
font
paint_preview_compositor
content
browser
child
common
gpu
ppapi_plugin
public
browser
common
renderer
shell
test
utility
zygote

@ -49,7 +49,7 @@ test("components_unittests") {
use_xvfb = true
}
if (is_android || is_linux || is_mac || is_win) {
if (is_android || is_linux || is_chromeos || is_mac || is_win) {
data = [ "test/data/" ]
}
@ -320,7 +320,7 @@ test("components_unittests") {
deps += [ ":components_tests_pak_bundle_data" ]
}
if (is_mac || is_linux) {
if (is_mac || is_linux || is_chromeos) {
data_deps += [ "//content/shell:pak" ]
}
@ -675,7 +675,7 @@ if (!is_ios && !is_fuchsia) {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
# content_extractor_browsertest is a standalone content extraction tool built as
# a MANUAL component_browsertest.
sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]

@ -28,7 +28,7 @@ source_set("browser") {
"//content/public/common",
]
if (is_linux || is_android) {
if (is_linux || is_chromeos || is_android) {
set_sources_assignment_filter([])
# Want this file on both Linux and Android.

@ -55,11 +55,11 @@ static_library("app") {
"crashpad_win.cc",
]
if (is_mac || is_win || is_android || is_linux) {
if (is_mac || is_win || is_android || is_linux || is_chromeos) {
sources += [ "crashpad.cc" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"breakpad_linux.cc",
"breakpad_linux.h",
@ -75,7 +75,7 @@ static_library("app") {
"//build:branding_buildflags",
]
if (is_mac || is_win || is_android || is_linux) {
if (is_mac || is_win || is_android || is_linux || is_chromeos) {
deps += [
"//third_party/crashpad/crashpad/client",
"//third_party/crashpad/crashpad/util",
@ -91,7 +91,7 @@ static_library("app") {
]
}
if (is_android || is_linux) {
if (is_android || is_linux || is_chromeos) {
deps += [
"//base:base_static",
"//components/crash/core/common",
@ -99,7 +99,7 @@ static_library("app") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//third_party/breakpad:client" ]
}
@ -130,7 +130,7 @@ static_library("app") {
libs = [ "log" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
data_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
}
}

@ -32,7 +32,7 @@ use_crashpad_annotation =
# implementations will be instantiated and set, doubling the storage
# used for keys. This is intended to be used temporarily to test Crashpad
# integrations without disabling Breakpad.
use_combined_annotations = is_linux
use_combined_annotations = is_linux || is_chromeos
buildflag_header("crash_buildflags") {
header = "crash_buildflags.h"

@ -158,7 +158,7 @@ if (is_android) {
defines = [ "CRONET_TESTS_IMPLEMENTATION" ]
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
}
@ -253,7 +253,7 @@ if (is_android) {
"//components/cronet",
"//components/cronet/native:cronet_native_headers",
]
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
}

@ -306,7 +306,7 @@ test("exo_unittests") {
data_deps = []
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//components/exo/wayland:unit_tests" ]
}

@ -14,7 +14,7 @@ test("gwp_asan_unittests") {
"//components/gwp_asan/common:unit_tests",
"//testing/gtest",
]
if (is_win || is_mac || is_linux || is_android) {
if (is_win || is_mac || is_linux || is_chromeos || is_android) {
deps += [
"//components/gwp_asan/client:unit_tests",
"//components/gwp_asan/crash_handler:unit_tests",

@ -400,7 +400,7 @@ static_library("demographics_test_support") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
static_library("serialization") {
sources = [
"serialization/metric_sample.cc",
@ -493,7 +493,7 @@ source_set("unit_tests") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "serialization/serialization_utils_unittest.cc" ]
deps += [ ":serialization" ]
}

@ -53,7 +53,7 @@ static_library("browser") {
data_deps = []
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"../zygote/nacl_fork_delegate_linux.cc",
"../zygote/nacl_fork_delegate_linux.h",
@ -95,7 +95,7 @@ source_set("unit_tests") {
"//net:test_support",
]
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "../zygote/nacl_fork_delegate_linux_unittest.cc" ]
}
}

@ -81,7 +81,7 @@ if (enable_nacl) {
"//url",
]
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"nacl_paths.cc",
"nacl_paths.h",

@ -106,7 +106,7 @@ test("nacl_loader_unittests") {
}
}
if (is_linux) {
if (is_linux || is_chromeos) {
executable("nacl_helper") {
sources = [
"nacl_helper_linux.cc",

@ -5,7 +5,7 @@
import("//build/config/ui.gni")
import("//components/nacl/features.gni")
assert(is_linux)
assert(is_linux || is_chromeos)
assert(enable_nacl)
source_set("sandbox_linux") {

@ -19,7 +19,7 @@ gen_policy_templates_local = false
# enable these flags (but don't check that in!).
gen_policy_templates_common = true
gen_policy_templates_win = is_win
gen_policy_templates_linux = is_linux
gen_policy_templates_linux = is_linux || is_chromeos
gen_policy_templates_android = is_android
gen_policy_templates_mac = is_mac
gen_policy_templates_chromeos = is_chromeos

@ -207,7 +207,7 @@ jumbo_source_set("internal") {
}
# Compile on Linux for fuzzer and since code is reused on Chrome OS.
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
sources += [
"preg_parser.cc",
"preg_parser.h",
@ -407,7 +407,7 @@ source_set("unit_tests") {
"schema_unittest.cc",
"values_util_unittest.cc",
]
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
sources += [
"preg_parser_unittest.cc",
"registry_dict_unittest.cc",
@ -463,7 +463,7 @@ source_set("unit_tests") {
configs += [ "//build/config/compiler:enable_arc" ]
}
}
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
# Needed by policy_loader_win_unittest.cc and preg_parser_unittest.cc
data = [ "//chrome/test/data/policy/" ]
}
@ -494,7 +494,7 @@ source_set("unit_tests") {
}
}
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
fuzzer_test("preg_parser_fuzzer") {
sources = [ "preg_parser_fuzzer.cc" ]
seed_corpus = "//chrome/test/data/policy/gpo/fuzzer_corpus"

@ -28,7 +28,7 @@ action("make_file_types_protobuf") {
target_arch = "win"
} else if (is_mac) {
target_arch = "mac"
} else if (is_linux) {
} else if (is_linux || is_chromeos) {
target_arch = "linux"
} else {
# This will cause the script to fail.

@ -26,12 +26,12 @@ source_set("lib") {
public_deps = [ "//skia" ]
if (is_linux && enable_plugins) {
if ((is_linux || is_chromeos) && enable_plugins) {
deps += [ ":ppapi_fontconfig_matching" ]
}
}
if (is_linux && enable_plugins) {
if ((is_linux || is_chromeos) && enable_plugins) {
source_set("ppapi_fontconfig_matching") {
sources = [
"ppapi_fontconfig_matching.cc",

@ -30,7 +30,7 @@ static_library("paint_preview_compositor") {
"//url",
]
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//components/services/font/public/cpp" ]
}

@ -2051,7 +2051,7 @@ jumbo_source_set("browser") {
deps += [ "//ui/events" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"font_service.cc",
"font_service.h",
@ -2092,7 +2092,7 @@ jumbo_source_set("browser") {
deps += [ "//chromecast:chromecast_buildflags" ]
}
if (is_chromecast && is_linux) {
if (is_chromecast && (is_linux || is_chromeos)) {
sources += [
"tracing/cast_tracing_agent.cc",
"tracing/cast_tracing_agent.h",
@ -2338,7 +2338,7 @@ jumbo_source_set("browser") {
} else if (use_pangocairo) {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//components/services/font:ppapi_fontconfig_matching" ]
}
}
@ -2376,7 +2376,7 @@ jumbo_source_set("browser") {
}
}
if (is_linux && use_aura) {
if ((is_linux || is_chromeos) && use_aura) {
deps += [ "//third_party/fontconfig" ]
}
@ -2714,7 +2714,7 @@ jumbo_source_set("browser") {
]
}
if (is_linux && use_dbus) {
if ((is_linux || is_chromeos) && use_dbus) {
deps += [ "//dbus" ]
}

@ -144,7 +144,7 @@ target(link_target_type, "child") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [
"//components/services/font/public/cpp",
"//components/services/font/public/mojom",

@ -344,7 +344,7 @@ source_set("common") {
sources -= [ "cursors/webcursor_aura.cc" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"zygote/sandbox_support_linux.cc",
"zygote/send_zygote_child_ping_linux.cc",

@ -13,4 +13,4 @@ declare_args() {
allow_critical_memory_pressure_handling_in_foreground = is_chromecast
}
enable_screen_capture = is_linux || is_mac || is_win || is_android
enable_screen_capture = is_linux || is_chromeos || is_mac || is_win || is_android

@ -100,7 +100,7 @@ target(link_target_type, "gpu_sources") {
deps += [ "//media/mojo/services" ]
}
if (is_linux || is_mac || is_win) {
if (is_linux || is_chromeos || is_mac || is_win) {
deps += [ "//sandbox" ]
}

@ -67,7 +67,7 @@ source_set("ppapi_plugin_sources") {
"//ui/gfx/geometry",
]
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//components/services/font/public/cpp" ]
}

@ -508,7 +508,7 @@ jumbo_source_set("browser_sources") {
sources += [ "remote_cocoa.h" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "zygote_host/zygote_host_linux.h" ]
}

@ -255,7 +255,7 @@ jumbo_source_set("common_sources") {
public_deps += [ "//media/capture/video/chromeos/public" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"zygote/sandbox_support_linux.h",
"zygote/send_zygote_child_ping_linux.h",

@ -426,7 +426,7 @@ target(link_target_type, "renderer") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//components/services/font/public/cpp" ]
}
@ -622,7 +622,7 @@ target(link_target_type, "renderer") {
]
}
if (is_linux || is_android) {
if (is_linux || is_chromeos || is_android) {
deps += [ "//sandbox:sandbox_buildflags" ]
}

@ -556,7 +556,7 @@ static_library("content_shell_lib") {
deps += [ "//gin" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//services/service_manager/tests:sandbox_status_service" ]
}
@ -625,7 +625,7 @@ static_library("content_shell_lib") {
deps += [ "//chromeos/dbus" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//build/config/freetype" ]
}
@ -782,12 +782,12 @@ if (is_android) {
}
}
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
data_deps +=
[ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
}
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
# Set rpath to find our own libfreetype even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}

@ -483,7 +483,7 @@ jumbo_static_library("test_support") {
}
# HID support is not available without udev.
is_linux_without_udev = is_linux && !use_udev
is_linux_without_udev = (is_linux || is_chromeos) && !use_udev
if (!is_linux_without_udev && !is_android) {
sources += [
"../browser/hid/hid_test_utils.cc",
@ -597,7 +597,7 @@ jumbo_static_library("test_support") {
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//ui/platform_window/common" ]
}
@ -1315,7 +1315,7 @@ test("content_browsertests") {
}
}
if (is_android || is_linux || is_mac || is_win) {
if (is_android || is_linux || is_chromeos || is_mac || is_win) {
data += [
"$root_out_dir/content_shell.pak",
"data/",
@ -1323,7 +1323,7 @@ test("content_browsertests") {
]
}
if (is_linux || is_mac || is_win) {
if (is_linux || is_chromeos || is_mac || is_win) {
sources += [
"../browser/media/capture/content_capture_device_browsertest_base.cc",
"../browser/media/capture/content_capture_device_browsertest_base.h",
@ -1385,7 +1385,7 @@ test("content_browsertests") {
configs += [ "//build/config/win:delayloads" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"../browser/utility_process_sandbox_browsertest.cc",
"../browser/zygote_host/zygote_browsertest.cc",
@ -1459,7 +1459,7 @@ test("content_browsertests") {
}
# HID support is not available without udev.
is_linux_without_udev = is_linux && !use_udev
is_linux_without_udev = (is_linux || is_chromeos) && !use_udev
if (!is_linux_without_udev && !is_android) {
sources += [
"../browser/hid/hid_browsertest.cc",
@ -1598,7 +1598,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//services/service_manager/embedder:set_process_title_linux" ]
}
}
@ -2076,7 +2076,7 @@ test("content_unittests") {
[ "../browser/accessibility/browser_accessibility_android_unittest.cc" ]
}
if (is_android || is_linux || is_mac || is_win || is_fuchsia) {
if (is_android || is_linux || is_chromeos || is_mac || is_win || is_fuchsia) {
data = [
"$root_out_dir/content_shell.pak",
"data/",
@ -2283,7 +2283,7 @@ test("content_unittests") {
}
}
if (is_linux) {
if (is_linux || is_chromeos) {
if (use_dbus) {
deps += [ "//dbus:test_support" ]
}
@ -2373,7 +2373,7 @@ test("content_unittests") {
}
# HID support is not available without udev.
is_linux_without_udev = is_linux && !use_udev
is_linux_without_udev = (is_linux || is_chromeos) && !use_udev
if (!is_linux_without_udev && !is_android) {
sources += [
"../browser/hid/hid_service_unittest.cc",
@ -2424,7 +2424,7 @@ test("content_unittests") {
deps += [ "//ui/gfx/x" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "../../services/service_manager/embedder/set_process_title_linux_unittest.cc" ]
deps += [ "//services/service_manager/embedder:set_process_title_linux" ]
}

@ -85,7 +85,7 @@ jumbo_source_set("utility") {
deps += [ "//services/proxy_resolver:lib" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ]
}

@ -5,7 +5,7 @@
import("//build/config/nacl/config.gni")
import("//content/public/common/zygote/features.gni")
if (is_linux) {
if (is_linux || is_chromeos) {
source_set("zygote") {
sources = [
"zygote_linux.cc",