Skip to content

Commit

Permalink
Add the Widevine CDM files to the Linux x64 installer.
Browse files Browse the repository at this point in the history
Also, adds the Widevine and External Clear Key CDM files to the archives for Linux and Chrome OS.

BUG=176639
TBR=thakis@chromium.org,mmoss@chromium.org

Review URL: https://chromiumcodereview.appspot.com/12287021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183311 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
ddorwin@chromium.org committed Feb 19, 2013
1 parent fe8821c commit 4ff8a37
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
2 changes: 2 additions & 0 deletions chrome/chrome_installer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,8 @@
'rpm_arch': 'x86_64',
'packaging_files_binaries': [
'<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
'<(PRODUCT_DIR)/libwidevinecdmadapter.so',
'<(PRODUCT_DIR)/libwidevinecdm.so',
],
}],
['target_arch=="arm"', {
Expand Down
20 changes: 20 additions & 0 deletions chrome/tools/build/chromeos/FILES.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,26 @@ FILES = [
'filename': 'xdg-settings',
'buildtype': ['dev', 'official'],
},
# CDM files (each has an adapter and the actual CDM):
{
'filename': 'libclearkeycdmadapter.so',
'buildtype': ['dev', 'official'],
},
{
'filename': 'libclearkeycdm.so',
'buildtype': ['dev', 'official'],
},
{
'filename': 'libwidevinecdmadapter.so',
'arch': ['arm'],
'buildtype': ['official'],
},
{
'filename': 'libwidevinecdm.so',
'arch': ['arm'],
'buildtype': ['official'],
'direct_archive': 1,
},
# PDF Plugin files:
{
'filename': 'libpdf.so',
Expand Down
20 changes: 20 additions & 0 deletions chrome/tools/build/linux/FILES.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,26 @@ FILES = [
'filename': 'xdg-settings',
'buildtype': ['dev', 'official'],
},
# CDM files (each has an adapter and the actual CDM):
{
'filename': 'libclearkeycdmadapter.so',
'buildtype': ['dev', 'official'],
},
{
'filename': 'libclearkeycdm.so',
'buildtype': ['dev', 'official'],
},
{
'filename': 'libwidevinecdmadapter.so',
'arch': ['64bit'],
'buildtype': ['official'],
},
{
'filename': 'libwidevinecdm.so',
'arch': ['64bit'],
'buildtype': ['official'],
'direct_archive': 1,
},
# Flash Player files:
# Pepper Flash Player files:
{
Expand Down

0 comments on commit 4ff8a37

Please sign in to comment.