diff options
| author | xhwang@google.com <xhwang@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 00:58:32 +0000 |
|---|---|---|
| committer | xhwang@google.com <xhwang@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 00:58:32 +0000 |
| commit | 8b96d463a2015b106f34e18d7096f686c57521f3 (patch) | |
| tree | 9702c6a3c91a5fe0911742716153d9a34ed05caf /webkit/media | |
| parent | 8533eeb2fd70fc56d20dd879c8793d600ebb56db (diff) | |
| download | chromium_src-8b96d463a2015b106f34e18d7096f686c57521f3.zip chromium_src-8b96d463a2015b106f34e18d7096f686c57521f3.tar.gz chromium_src-8b96d463a2015b106f34e18d7096f686c57521f3.tar.bz2 | |
Exclude OS_CHROMEOS when using WIDEVINE_CDM_MIN_GLIBC_VERSION.
BUG=224767
NOTRY=true
R=ddoriwin@chromium.org
Review URL: https://codereview.chromium.org/13415002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/key_systems.cc | 10 | ||||
| -rw-r--r-- | webkit/media/crypto/key_systems_unittest.cc | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc index 7750aa5..4a841fc 100644 --- a/webkit/media/crypto/key_systems.cc +++ b/webkit/media/crypto/key_systems.cc @@ -15,10 +15,11 @@ #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#if defined(WIDEVINE_CDM_AVAILABLE) && \ + defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> #include "base/version.h" -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#endif namespace webkit_media { @@ -181,13 +182,14 @@ KeySystems::KeySystems() { } static inline bool IsSystemCompatible(const std::string& key_system) { -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#if defined(WIDEVINE_CDM_AVAILABLE) && \ + defined(OS_LINUX) && !defined(OS_CHROMEOS) if (key_system == kWidevineKeySystem) { Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); return !glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION); } -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#endif return true; } diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/media/crypto/key_systems_unittest.cc index 776910a..0c25196 100644 --- a/webkit/media/crypto/key_systems_unittest.cc +++ b/webkit/media/crypto/key_systems_unittest.cc @@ -11,9 +11,10 @@ #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#if defined(WIDEVINE_CDM_AVAILABLE) && \ + defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX) +#endif using WebKit::WebString; @@ -24,13 +25,13 @@ using WebKit::WebString; #endif #if defined(WIDEVINE_CDM_AVAILABLE) -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) // TODO(ddorwin): Remove after bots switch to Precise. #define EXPECT_WV(a) \ EXPECT_EQ((std::string(gnu_get_libc_version()) != "2.11.1"), (a)) #else #define EXPECT_WV EXPECT_TRUE -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) #define EXPECT_WVCENC EXPECT_TRUE |