From 77efb41adb7b9a99f0827926027ca0f34c381544 Mon Sep 17 00:00:00 2001 From: Xiaohan Wang Date: Fri, 3 Feb 2023 16:20:33 +0000 Subject: [PATCH] widevine: Update various files to support Windows arm64 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 Reviewed-by: Samuel Huang Commit-Queue: Xiaohan Wang Reviewed-by: Gabriel Charette Cr-Commit-Position: refs/heads/main@{#1101008} --- chrome/installer/mini_installer/chrome.release | 2 ++ chrome/tools/build/win/FILES.cfg | 10 ++++++++++ infra/scripts/sizes.py | 3 +-- tools/binary_size/sizes.py | 3 +-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 6523364f6870b..088d1778f317c 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -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 diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 234dcc097f9bc..f5bbce59331f7 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -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', diff --git a/infra/scripts/sizes.py b/infra/scripts/sizes.py index 9a8da0b745638..83bd8a2818567 100755 --- a/infra/scripts/sizes.py +++ b/infra/scripts/sizes.py @@ -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) diff --git a/tools/binary_size/sizes.py b/tools/binary_size/sizes.py index 097a840846d69..9215bfcb0338d 100755 --- a/tools/binary_size/sizes.py +++ b/tools/binary_size/sizes.py @@ -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: