summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-18 22:43:55 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-18 22:43:55 +0000
commitea903173ee5c6877813c046c1e7f2f27fca19f0f (patch)
tree15ea8464177b93c584738a28671550bfddfbedea /third_party
parent1b67bb75e67ab3b24746fa70ebc910bcfd3c2178 (diff)
downloadchromium_src-ea903173ee5c6877813c046c1e7f2f27fca19f0f.zip
chromium_src-ea903173ee5c6877813c046c1e7f2f27fca19f0f.tar.gz
chromium_src-ea903173ee5c6877813c046c1e7f2f27fca19f0f.tar.bz2
Enable canPlayType() on Chromium for Android builds.
Previously it was only enabled on Chrome for Android builds. BUG=none TEST=KeySystem tests still pass on Chrome and Chromium builds. Review URL: https://chromiumcodereview.appspot.com/23707048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/widevine/cdm/widevine_cdm.gyp9
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 294eab6..3114393 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -38,13 +38,12 @@
'binaries/win/<(target_arch)/widevinecdm.dll.lib',
],
}],
- # TODO(xhwang): Enable this for non-Chrome build if necessary.
- [ 'OS == "android" and google_tv != 1', {
- 'widevine_cdm_version_h_file%':
- 'android/widevine_cdm_version.h',
- }],
],
}],
+ [ 'OS == "android" and google_tv != 1', {
+ 'widevine_cdm_version_h_file%':
+ 'android/widevine_cdm_version.h',
+ }],
],
},
# Always provide a target, so we can put the logic about whether there's