Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Issue 2150043003: Reland of "Fix build of Widevine CDM stub on Mac" (Closed)

Created:
4 years, 5 months ago by wdzierzanowski
Modified:
4 years, 5 months ago
Reviewers:
ddorwin
CC:
chromium-reviews, eme-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@crbug-622282
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Reland of "Fix build of Widevine CDM stub on Mac" The combination of 'branding=Chromium' and 'enable_widevine=1' causes 'widevinecdm' to be a 'shared_library' build of the CDM stub. Additionally combined with 'mac_strip_release=1', this triggers 'strip_save_dsym', which fails, because it doesn't support 'product_dir'. This fix does to 'widevinecdm' what has already been done to 'clearkeycdm': Split the target into 'widevinecdm_binary' which builds and strips the stub binary, and 'widevinecdm' which just copies the binary. This CL relands https://codereview.chromium.org/2117343005/ with the following change: The new 'widevinecdm_binary' target is now defined conditionally for the case when it is really needed, to fix the ninja error "multiple rules generate WidevineCdm/_platform_specific/win_x86/widevinecdm.dll". BUG=622282 TEST='build/gyp_chromium -Gconfig=Release -Dbranding=Chromium -Denable_widevine=1 -Dmac_strip_release=1 && ninja -C out/Release widevinecdm' is successful

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+45 lines, -18 lines) Patch
M third_party/widevine/cdm/widevine_cdm.gyp View 3 chunks +45 lines, -18 lines 0 comments Download

Depends on Patchset:

Messages

Total messages: 5 (2 generated)
wdzierzanowski
ddorwin: I fixed the "multiple rules generate..." error and I'm trying to reland the CL. ...
4 years, 5 months ago (2016-07-14 20:33:22 UTC) #2
ddorwin
Please upload the original code as the first patchset then the fix as the second ...
4 years, 5 months ago (2016-07-14 20:37:06 UTC) #3
wdzierzanowski
4 years, 5 months ago (2016-07-14 21:24:20 UTC) #4
On 2016/07/14 20:37:06, ddorwin wrote:
> Please upload the original code as the first patchset then the fix as the
second
> patchset. Alternatively, you can upload a new patch set to the original review
> and reuse it.

Alright then: https://codereview.chromium.org/2149233003/

Powered by Google App Engine
This is Rietveld 408576698