Skip to content

Commit

Permalink
widevine: Update various files to support Windows arm64
Browse files Browse the repository at this point in the history
Also remove widevinecdmadapter.dll which has long been deprecated.

Bug: 1406077, b/267572555
Change-Id: I3608cc7689a541a63d635e0bcf6830cf27196473
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4217155
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1101008}
  • Loading branch information
xhwang-chromium authored and Chromium LUCI CQ committed Feb 3, 2023
1 parent 1d9ba78 commit 77efb41
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions chrome/installer/mini_installer/chrome.release
Expand Up @@ -98,6 +98,8 @@ WidevineCdm\_platform_specific\win_x86\widevinecdm.dll: %(VersionDir)s\WidevineC
WidevineCdm\_platform_specific\win_x86\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_x86\
WidevineCdm\_platform_specific\win_x64\widevinecdm.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_x64\
WidevineCdm\_platform_specific\win_x64\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_x64\
WidevineCdm\_platform_specific\win_arm64\widevinecdm.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_arm64\
WidevineCdm\_platform_specific\win_arm64\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_arm64\

[SNAPSHOTBLOB]
# The snapshot_blob.bin V8 snapshot is needed in builds that don't use
Expand Down
10 changes: 10 additions & 0 deletions chrome/tools/build/win/FILES.cfg
Expand Up @@ -367,6 +367,16 @@ FILES = [
'arch': ['64bit'],
'buildtype': ['official'],
},
{
'filename': 'WidevineCdm/_platform_specific/win_arm64/widevinecdm.dll',
'arch': ['arm'],
'buildtype': ['official'],
},
{
'filename': 'WidevineCdm/_platform_specific/win_arm64/widevinecdm.dll.sig',
'arch': ['arm'],
'buildtype': ['official'],
},
# ANGLE files:
{
'filename': 'D3DCompiler_47.dll',
Expand Down
3 changes: 1 addition & 2 deletions infra/scripts/sizes.py
Expand Up @@ -406,10 +406,9 @@ def main_win(options, args, results_collector):
'mini_installer.exe',
'resources.pak',
'setup.exe',
'WidevineCdm\\_platform_specific\\win_arm64\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x64\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x64\\widevinecdmadapter.dll',
'WidevineCdm\\_platform_specific\\win_x86\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x86\\widevinecdmadapter.dll',
]

build_dir = build_directory.GetBuildOutputDirectory(SRC_DIR)
Expand Down
3 changes: 1 addition & 2 deletions tools/binary_size/sizes.py
Expand Up @@ -376,10 +376,9 @@ def main_win(output_directory, results_collector, size_path):
'notification_helper.exe',
'resources.pak',
'setup.exe',
'WidevineCdm\\_platform_specific\\win_arm64\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x64\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x64\\widevinecdmadapter.dll',
'WidevineCdm\\_platform_specific\\win_x86\\widevinecdm.dll',
'WidevineCdm\\_platform_specific\\win_x86\\widevinecdmadapter.dll',
]

for f in files:
Expand Down

0 comments on commit 77efb41

Please sign in to comment.