Commit ce384efc authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Rewrite is_linux flag for tools and weblayer 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: I4dc4cd45eeaf1ca0a824b2a236fc55e0871f1c75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2326295Reviewed-by: default avatarHidehiko Abe <hidehiko@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#793515}
parent be9215d5
...@@ -21,7 +21,7 @@ python_library("sizes_py") { ...@@ -21,7 +21,7 @@ python_library("sizes_py") {
data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ] data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ]
} }
if (is_linux) { if (is_linux || is_chromeos) {
group("caspian") { group("caspian") {
deps = [ "//tools/binary_size/libsupersize/caspian:cli($host_toolchain)" ] deps = [ "//tools/binary_size/libsupersize/caspian:cli($host_toolchain)" ]
} }
......
...@@ -9,7 +9,7 @@ if (!defined(is_wasm)) { ...@@ -9,7 +9,7 @@ if (!defined(is_wasm)) {
is_wasm = current_os == "wasm" is_wasm = current_os == "wasm"
} }
assert(is_linux || is_wasm) assert(is_linux || is_chromeos || is_wasm)
source_set("caspian-lib") { source_set("caspian-lib") {
sources = [ sources = [
......
...@@ -104,7 +104,7 @@ if (enable_resource_whitelist_generation) { ...@@ -104,7 +104,7 @@ if (enable_resource_whitelist_generation) {
grit_defines = [] grit_defines = []
if (is_mac || is_win || is_linux || is_ios) { if (is_mac || is_win || is_linux || is_chromeos || is_ios) {
grit_defines += [ grit_defines += [
"-D", "-D",
"scale_factors=2x", "scale_factors=2x",
...@@ -199,7 +199,7 @@ if (current_toolchain != host_toolchain) { ...@@ -199,7 +199,7 @@ if (current_toolchain != host_toolchain) {
"ios", "ios",
] ]
} }
if (is_linux) { if (is_linux || is_chromeos) {
grit_defines += [ grit_defines += [
"-t", "-t",
"linux2", "linux2",
......
...@@ -13,5 +13,5 @@ declare_args() { ...@@ -13,5 +13,5 @@ declare_args() {
# (especially MSan). # (especially MSan).
enable_ipc_fuzzer = enable_ipc_fuzzer =
is_clang && !is_component_build && !is_official_build && !is_chromecast && is_clang && !is_component_build && !is_official_build && !is_chromecast &&
!using_sanitizer && (is_linux || is_mac || is_win) && !use_ozone !using_sanitizer && (is_linux || is_chromeos || is_mac || is_win) && !use_ozone
} }
...@@ -43,7 +43,7 @@ group("telemetry_chrome_test") { ...@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ] data_deps += [ "//chrome:reorder_imports" ]
} }
if (is_linux) { if (is_linux || is_chromeos) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
# CrOS currently has issues with the locally compiled version of # CrOS currently has issues with the locally compiled version of
......
...@@ -6,7 +6,7 @@ import("//testing/test.gni") ...@@ -6,7 +6,7 @@ import("//testing/test.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
# Works only on Windows and Linux. # Works only on Windows and Linux.
assert(is_win || is_linux) assert(is_win || is_linux || is_chromeos)
proto_library("chrome_settings_full_runtime") { proto_library("chrome_settings_full_runtime") {
proto_out_dir = "/tools/traffic_annotation" proto_out_dir = "/tools/traffic_annotation"
......
...@@ -593,7 +593,7 @@ source_set("weblayer_lib_base") { ...@@ -593,7 +593,7 @@ source_set("weblayer_lib_base") {
} }
} }
if (is_linux) { if (is_linux || is_chromeos) {
deps += [ deps += [
"//build/config/freetype", "//build/config/freetype",
"//third_party/fontconfig", "//third_party/fontconfig",
......
...@@ -61,7 +61,7 @@ static_library("weblayer_shell_lib") { ...@@ -61,7 +61,7 @@ static_library("weblayer_shell_lib") {
"//weblayer:resources", "//weblayer:resources",
] ]
if (is_linux) { if (is_linux || is_chromeos) {
deps += [ deps += [
"//third_party/fontconfig", "//third_party/fontconfig",
"//ui/gfx:test_support", "//ui/gfx:test_support",
...@@ -103,7 +103,7 @@ static_library("weblayer_shell_lib") { ...@@ -103,7 +103,7 @@ static_library("weblayer_shell_lib") {
} }
} }
if (is_linux) { if (is_linux || is_chromeos) {
deps += [ "//build/config/freetype" ] deps += [ "//build/config/freetype" ]
} }
} }
...@@ -259,7 +259,7 @@ if (is_android) { ...@@ -259,7 +259,7 @@ if (is_android) {
[ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] [ "//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. # Set rpath to find our own libfreetype even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment