Skip to content

Commit

Permalink
Update Widevine CDM binary/symbol locations.
Browse files Browse the repository at this point in the history
BUG=328642

Review URL: https://codereview.chromium.org/99533005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242247 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
xhwang@chromium.org committed Dec 21, 2013
1 parent dd9dd3d commit ddc78c8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,10 @@ v8.log
/third_party/webrtc
/third_party/webrtc/internal
/third_party/webrtc/modules/video_coding/codecs/vp8_internal
/third_party/widevine/cdm/binaries
/third_party/widevine/cdm/symbols
/third_party/widevine/cdm/chromeos
/third_party/widevine/cdm/linux
/third_party/widevine/cdm/mac
/third_party/widevine/cdm/win
/third_party/win_toolchain/.timestamps
/third_party/win_toolchain/files
/third_party/wix
Expand Down
18 changes: 9 additions & 9 deletions third_party/widevine/cdm/widevine_cdm.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@
'conditions': [
[ 'chromeos == 1', {
'widevine_cdm_version_h_file%':
'symbols/chromeos/<(target_arch)/widevine_cdm_version.h',
'chromeos/<(target_arch)/widevine_cdm_version.h',
'widevine_cdm_binary_files%': [
'binaries/chromeos/<(target_arch)/libwidevinecdm.so',
'chromeos/<(target_arch)/libwidevinecdm.so',
],
}],
[ 'OS == "linux" and chromeos == 0', {
'widevine_cdm_version_h_file%':
'symbols/linux/<(target_arch)/widevine_cdm_version.h',
'linux/<(target_arch)/widevine_cdm_version.h',
'widevine_cdm_binary_files%': [
'binaries/linux/<(target_arch)/libwidevinecdm.so',
'linux/<(target_arch)/libwidevinecdm.so',
],
}],
[ 'OS == "mac"', {
'widevine_cdm_version_h_file%':
'symbols/mac/<(target_arch)/widevine_cdm_version.h',
'mac/<(target_arch)/widevine_cdm_version.h',
'widevine_cdm_binary_files%': [
'binaries/mac/<(target_arch)/libwidevinecdm.dylib',
'mac/<(target_arch)/libwidevinecdm.dylib',
],
}],
[ 'OS == "win"', {
'widevine_cdm_version_h_file%':
'symbols/win/<(target_arch)/widevine_cdm_version.h',
'win/<(target_arch)/widevine_cdm_version.h',
'widevine_cdm_binary_files%': [
'binaries/win/<(target_arch)/widevinecdm.dll',
'binaries/win/<(target_arch)/widevinecdm.dll.lib',
'win/<(target_arch)/widevinecdm.dll',
'win/<(target_arch)/widevinecdm.dll.lib',
],
}],
],
Expand Down

0 comments on commit ddc78c8

Please sign in to comment.