Skip to content

Commit

Permalink
Expand is_linux to is_linux || is_chromeos.
Browse files Browse the repository at this point in the history
Currently is_linux is set to true on Chrome OS build,
but it is planned to be set false. This CL is the preparation
to keep the compatibility.

Bug: chromium:1110266
Test: Build locally.
Change-Id: Ic79a202b0b3baeff157955cd03a07556bfb958a8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/183860
Reviewed-by: Mirko Bonadei <[email protected]>
Commit-Queue: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/master@{#32073}
  • Loading branch information
Hidehiko Abe authored and Commit Bot committed Sep 10, 2020
1 parent 0240bcc commit f264e70
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ config("common_inherited_config") {
"WEBRTC_IOS",
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
defines += [ "WEBRTC_LINUX" ]
}
if (is_mac) {
Expand Down
2 changes: 1 addition & 1 deletion audio/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ if (rtc_include_tests) {
data += [ "${root_out_dir}/low_bandwidth_audio_test" ]
}

if (is_linux || is_android) {
if (is_linux || is_chromeos || is_android) {
data += [
"../tools_webrtc/audio_quality/linux/PolqaOem64",
"../tools_webrtc/audio_quality/linux/pesq",
Expand Down
6 changes: 3 additions & 3 deletions examples/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ group("examples") {
deps += [ ":AppRTCMobile" ]
}

if (is_linux || is_win) {
if (is_linux || is_chromeos || is_win) {
deps += [
":peerconnection_server",
":stunserver",
Expand Down Expand Up @@ -647,7 +647,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
}
}

if (is_linux || is_win) {
if (is_linux || is_chromeos || is_win) {
rtc_executable("peerconnection_client") {
testonly = true
sources = [
Expand Down Expand Up @@ -691,7 +691,7 @@ if (is_linux || is_win) {
configs += [ "//build/config/win:windowed" ]
deps += [ "../media:rtc_media_base" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"peerconnection/client/linux/main.cc",
"peerconnection/client/linux/main_wnd.cc",
Expand Down
2 changes: 1 addition & 1 deletion modules/audio_coding/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ rtc_library("isac_c") {
"codecs/isac/main/source/transform.c",
]

if (is_linux) {
if (is_linux || is_chromeos) {
libs = [ "m" ]
}

Expand Down
4 changes: 2 additions & 2 deletions modules/audio_device/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ rtc_library("audio_device_impl") {
if (rtc_use_dummy_audio_file_devices) {
defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
} else {
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [
"linux/alsasymboltable_linux.cc",
"linux/alsasymboltable_linux.h",
Expand Down Expand Up @@ -393,7 +393,7 @@ if (rtc_include_tests) {
"../utility",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
if (is_linux || is_mac || is_win) {
if (is_linux || is_chromeos || is_mac || is_win) {
sources += [ "audio_device_unittest.cc" ]
}
if (is_win) {
Expand Down
6 changes: 3 additions & 3 deletions modules/desktop_capture/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ if (rtc_include_tests) {
"screen_drawer.h",
]

if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "screen_drawer_linux.cc" ]
}

Expand Down Expand Up @@ -186,7 +186,7 @@ if (rtc_include_tests) {
}
}

if (is_linux) {
if (is_linux || is_chromeos) {
if (rtc_use_pipewire) {
pkg_config("gio") {
packages = [
Expand Down Expand Up @@ -357,7 +357,7 @@ rtc_library("desktop_capture_generic") {
"window_capturer_linux.cc",
]

if (build_with_mozilla && is_linux) {
if (build_with_mozilla && (is_linux || is_chromeos)) {
sources += [
"app_capturer_linux.cc",
"linux/app_capturer_x11.cc",
Expand Down
6 changes: 3 additions & 3 deletions modules/video_capture/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if (!build_with_chromium) {
"../../system_wrappers",
]

if (is_linux) {
if (is_linux || is_chromeos) {
sources = [
"linux/device_info_linux.cc",
"linux/device_info_linux.h",
Expand Down Expand Up @@ -113,13 +113,13 @@ if (!build_with_chromium) {
rtc_test("video_capture_tests") {
sources = [ "test/video_capture_unittest.cc" ]
ldflags = []
if (is_linux || is_mac) {
if (is_linux || is_chromeos || is_mac) {
ldflags += [
"-lpthread",
"-lm",
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
ldflags += [
"-lrt",
"-lXext",
Expand Down
2 changes: 1 addition & 1 deletion rtc_base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ rtc_library("rtc_base") {
deps += [ "system:cocoa_threading" ]
}

if (is_linux) {
if (is_linux || is_chromeos) {
libs += [
"dl",
"rt",
Expand Down
2 changes: 1 addition & 1 deletion system_wrappers/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ rtc_library("system_wrappers") {
libs += [ "log" ]
}

if (is_linux) {
if (is_linux || is_chromeos) {
if (!build_with_chromium) {
sources += [ "source/cpu_features_linux.cc" ]
}
Expand Down
6 changes: 3 additions & 3 deletions test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -966,17 +966,17 @@ rtc_library("test_renderer_generic") {
]
deps += [ "../api:scoped_refptr" ]
}
if (!(is_linux && rtc_use_x11) && !is_mac && !is_win) {
if (!((is_linux || is_chromeos) && rtc_use_x11) && !is_mac && !is_win) {
sources += [ "null_platform_renderer.cc" ]
}
if ((is_linux && rtc_use_x11) || is_mac) {
if (((is_linux || is_chromeos) && rtc_use_x11) || is_mac) {
sources += [
"gl/gl_renderer.cc",
"gl/gl_renderer.h",
]
}

if (is_linux && rtc_use_x11) {
if ((is_linux || is_chromeos) && rtc_use_x11) {
sources += [
"linux/glx_renderer.cc",
"linux/glx_renderer.h",
Expand Down
2 changes: 1 addition & 1 deletion webrtc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ rtc_opus_dir = "//third_party/opus"
# Desktop capturer is supported only on Windows, OSX and Linux.
rtc_desktop_capture_supported =
(is_win && current_os != "winuwp") || is_mac ||
(is_linux && (rtc_use_x11_extensions || rtc_use_pipewire))
((is_linux || is_chromeos) && (rtc_use_x11_extensions || rtc_use_pipewire))

###############################################################################
# Templates
Expand Down

0 comments on commit f264e70

Please sign in to comment.