zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand is_linux to is_linux || is_chromeos.

Browse Source 
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 <mbonadei@webrtc.org>
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#32073}
This commit is contained in:
Hidehiko Abe
2020-09-10 18:10:11 +09:00
committed by Commit Bot
parent 0240bcc1f3
commit f264e70a47
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_coding/BUILD.gn
View File

@ -483,7 +483,7 @@ rtc_library("isac_c") {
"codecs/isac/main/source/transform.c",
]
if (is_linux) {
if (is_linux || is_chromeos) {
libs = [ "m" ]
}

4
modules/audio_device/BUILD.gn
View File

@ -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",
@ -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) {

6
modules/desktop_capture/BUILD.gn
View File

@ -140,7 +140,7 @@ if (rtc_include_tests) {
"screen_drawer.h",
]
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "screen_drawer_linux.cc" ]
}
@ -186,7 +186,7 @@ if (rtc_include_tests) {
}
}
if (is_linux) {
if (is_linux || is_chromeos) {
if (rtc_use_pipewire) {
pkg_config("gio") {
packages = [
@ -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",

6
modules/video_capture/BUILD.gn
View File

@ -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",
@ -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",