|
Revert of media: Use platform specific folders for CDMs (patchset #6 id:100001 of https://chromiumcodereview.appspot.com/1989893004/ )
Reason for revert:
This is breaking the Mac bot. Apparently I need to use the "copy" trick for clearkeycdm as well to avoid the strip_save_dsym issue.
https://build.chromium.org/p/chromium/waterfall?builder=Mac
Original issue's description:
> media: Use platform specific folders for CDMs
>
> This is a reland of commit c8450e051cb3cc4705f698428ae42631aabe3672 with some major refactoring and fixes.
>
> * Purpose of this CL:
>
> To support bundled CDM using DefaultCompnentInstaller, the folder structure of bundled CDMs should be the same as component updated CDMs.
>
> For component CDMs, the folder structure is like:
> <DIR_USER_DATA>/WidevineCdm/<version>/_platform_specific/win_x64
>
> For bundled CDM, the folder structure should be like:
> <DIR_COMPONENTS>/WidevineCdm/_platform_specific/win_x64
> Note that the <version> folder is not needed in this case.
>
> * What this CL does:
>
> - Introduce cdm_paths.* to put CDMs in platform specific folders. On Win/Mac, we have something like WidevineCdm/_platform_specific/win_x64. On Linux/Cros, we don't use platform specific folders.
>
> - On Mac, strip_save_dsym doesn't work with targets with "product_dir" (in gyp build). So we build to the default output dir first, then copy it over to the platform specific folder. See http://crbug.com/611990 for more details.
>
> - Updated all tests to support platform specific folders.
>
> - Update installer files to bundle the CDM (adapter) in the right folder.
>
> TBR=gab@chromium.org
> BUG= 582622
> TEST=All tests pass. Tested on Mac and Linux.
>
> Committed: https://crrev.com/e13213d846ff7bdd794588b7efd152c3b5080a8d
> Cr-Commit-Position: refs/heads/master@{#395275}
TBR=ddorwin@chromium.org,thestig@chromium.org,gab@chromium.org,rsesek@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 582622
Committed: https://crrev.com/61b254913ac4c5356ce760b414df5180ab97f728
Cr-Commit-Position: refs/heads/master@{#395276}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+103 lines, -503 lines) |
Patch |
 |
M |
chrome/BUILD.gn
|
View
|
|
1 chunk |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/DEPS
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/content_settings/content_settings_browsertest.cc
|
View
|
|
1 chunk |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/load_library_perf_test.cc
|
View
|
|
2 chunks |
+23 lines, -41 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/media/encrypted_media_browsertest.cc
|
View
|
|
1 chunk |
+4 lines, -6 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/media/encrypted_media_supported_types_browsertest.cc
|
View
|
|
3 chunks |
+4 lines, -7 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/media/pepper_cdm_test_helper.h
|
View
|
|
3 chunks |
+2 lines, -7 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/media/pepper_cdm_test_helper.cc
|
View
|
|
3 chunks |
+3 lines, -12 lines |
0 comments
|
Download
|
 |
M |
chrome/browser_tests.isolate
|
View
|
|
3 chunks |
+14 lines, -43 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_dll_bundle.gypi
|
View
|
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_installer.gypi
|
View
|
|
3 chunks |
+4 lines, -7 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_tests.gypi
|
View
|
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_tests_unit.gypi
|
View
|
|
1 chunk |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
chrome/common/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/common/chrome_paths.cc
|
View
|
|
3 chunks |
+1 line, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/common_constants.gyp
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/installer/linux/BUILD.gn
|
View
|
|
2 chunks |
+4 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/installer/mini_installer/chrome.release
|
View
|
|
1 chunk |
+1 line, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/test/BUILD.gn
|
View
|
|
2 chunks |
+5 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/tools/build/win/FILES.cfg
|
View
|
|
1 chunk |
+1 line, -7 lines |
0 comments
|
Download
|
 |
M |
media/BUILD.gn
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
D |
media/cdm/cdm_paths.h
|
View
|
|
1 chunk |
+0 lines, -24 lines |
0 comments
|
Download
|
 |
D |
media/cdm/cdm_paths.cc
|
View
|
|
1 chunk |
+0 lines, -68 lines |
0 comments
|
Download
|
 |
M |
media/cdm/external_clear_key_test_helper.cc
|
View
|
|
3 chunks |
+3 lines, -8 lines |
0 comments
|
Download
|
 |
M |
media/cdm/ppapi/BUILD.gn
|
View
|
|
3 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
D |
media/cdm/ppapi/cdm_paths.gni
|
View
|
|
1 chunk |
+0 lines, -41 lines |
0 comments
|
Download
|
 |
D |
media/cdm_paths.gypi
|
View
|
|
1 chunk |
+0 lines, -58 lines |
0 comments
|
Download
|
 |
M |
media/media.gyp
|
View
|
|
2 chunks |
+0 lines, -20 lines |
0 comments
|
Download
|
 |
M |
media/media_cdm.gypi
|
View
|
|
5 chunks |
+5 lines, -36 lines |
0 comments
|
Download
|
 |
M |
third_party/widevine/cdm/BUILD.gn
|
View
|
|
5 chunks |
+4 lines, -10 lines |
0 comments
|
Download
|
 |
M |
third_party/widevine/cdm/widevine_cdm.gyp
|
View
|
|
4 chunks |
+12 lines, -36 lines |
0 comments
|
Download
|
 |
M |
third_party/widevine/cdm/widevine_cdm_common.h
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
Total messages: 6 (2 generated)
|