chromium/src
0
Fork 0
Code Activity

media: Replace is_desktop_linux with is_linux

Browse Source 
Now they are defined the same. Use `is_linux` everywhere to avoid
confusion.

Bug: 1132395
Change-Id: Ib6288cefb2b3447b7ead54632f31dd34d778dd6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431777
Reviewed-by: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810797}
This commit is contained in:
Xiaohan Wang
2020-09-25 21:43:40 +00:00
committed by Commit Bot
parent 654c32c8b6
commit 27d3750c0f
5 changed files with 7 additions and 6 deletions
chrome/common
BUILD.gn
media
cdm
library_cdm
cdm_paths.gni
media_options.gni
third_party/widevine/cdm
BUILD.gnwidevine.gni

2
chrome/common/BUILD.gn

@ -477,7 +477,7 @@ static_library("common") {
deps += [ "//media/cdm:cdm_paths" ] # Needed by chrome_content_client.cc
if (enable_widevine) {
if (is_desktop_linux) {
if (is_linux) {
sources += [
"media/component_widevine_cdm_hint_file_linux.cc",
"media/component_widevine_cdm_hint_file_linux.h",

2
media/cdm/library_cdm/cdm_paths.gni

@ -29,7 +29,7 @@ component_arch = "$current_cpu"
# - |cdm_platform_specific_path| is exported as a BUILDFLAG to cdm_paths.cc.
# - When updating the condition here, also update the condition on the define
# of CDM_USE_PLATFORM_SPECIFIC_PATH in cdm_paths_unittest.cc.
if (is_win || is_mac || is_desktop_linux) {
if (is_win || is_mac || is_linux) {
cdm_platform_specific_path =
"_platform_specific/$component_os" + "_" + "$component_arch"

2
media/media_options.gni

@ -196,7 +196,7 @@ if (is_chromecast) {
"video_decoder",
]
_default_mojo_media_host = "gpu"
} else if (is_chromeos || is_mac || is_win || (is_desktop_linux && use_vaapi)) {
} else if (is_chromeos || is_mac || is_win || (is_linux && use_vaapi)) {
_default_mojo_media_services = [ "video_decoder" ]
_default_mojo_media_host = "gpu"
}

2
third_party/widevine/cdm/BUILD.gn vendored

@ -34,7 +34,7 @@ if (bundle_widevine_cdm) {
widevine_cdm_version_h_file =
"chromeos/$widevine_arch/widevine_cdm_version.h"
widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ]
} else if (is_desktop_linux) {
} else if (is_linux) {
widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h"
widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ]
widevine_cdm_manifest_and_license_files = [

5
third_party/widevine/cdm/widevine.gni vendored

@ -23,7 +23,7 @@ if (is_chromeos && !is_chromeos_device) {
# supported via Android MediaDrm API.
library_widevine_cdm_available =
(is_chromeos && (target_cpu == "x64" || target_cpu == "arm")) ||
(is_desktop_linux && (target_cpu == "x86" || target_cpu == "x64")) ||
(is_linux && (target_cpu == "x86" || target_cpu == "x64")) ||
(is_mac && (target_cpu == "x64" || target_cpu == "arm64")) ||
(is_win && (target_cpu == "x86" || target_cpu == "x64"))
@ -36,8 +36,9 @@ enable_library_widevine_cdm =
# Widevine CDM can be deployed as a component. Currently only supported on
# Mac, Windows, and desktop Linux. The CDM can be bundled regardless whether
# it's a component. See below.
# Note: Not enabled on ChromeOS. See https://crbug.com/971433
enable_widevine_cdm_component =
enable_library_widevine_cdm && (is_win || is_mac || is_desktop_linux)
enable_library_widevine_cdm && (is_win || is_mac || is_linux)
# Widevine CDM is bundled as part of Google Chrome builds.
bundle_widevine_cdm = enable_library_widevine_cdm && is_chrome_branded