diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-01 22:42:46 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-01 22:42:46 +0000 |
| commit | 8fa8f2d42a572e976d7987cafa16178c6d2ede8f (patch) | |
| tree | ae2f1a72174c4367c8bcc923da0eb263853e1955 | |
| parent | 95791d0ab0505be62bca8de2aceecb053d4adc9b (diff) | |
| download | chromium_src-8fa8f2d42a572e976d7987cafa16178c6d2ede8f.zip chromium_src-8fa8f2d42a572e976d7987cafa16178c6d2ede8f.tar.gz chromium_src-8fa8f2d42a572e976d7987cafa16178c6d2ede8f.tar.bz2 | |
Use #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) instead of OS checks.
The existing OS checks added unnecessary details to the implementation, and the
build could break under certain conditions.
Review URL: https://chromiumcodereview.appspot.com/23503021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220742 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/media/crypto/key_systems_info.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/renderer/media/crypto/key_systems_info.cc b/content/renderer/media/crypto/key_systems_info.cc index 55878b3..a1c8d06 100644 --- a/content/renderer/media/crypto/key_systems_info.cc +++ b/content/renderer/media/crypto/key_systems_info.cc @@ -12,10 +12,8 @@ // The following must be after widevine_cdm_version.h. -#if defined(WIDEVINE_CDM_AVAILABLE) && \ - defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) #include <gnu/libc-version.h> -#include "base/logging.h" #include "base/version.h" #endif @@ -60,12 +58,12 @@ static const char kWidevineAudioMp4Codecs[] = #endif // defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) static void RegisterWidevine() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION)) return; -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) AddConcreteSupportedKeySystem( kWidevineKeySystem, |