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

Issue 2149233003: 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@master
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 Committed: https://crrev.com/117144d7ad598ec731f258f5272142708274d635 Cr-Commit-Position: refs/heads/master@{#405635}

Patch Set 1 #

Patch Set 2 : Define widevinecdm_binary conditionally #

Total comments: 2

Patch Set 3 : Remove outdated "above" #

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 1 2 3 chunks +45 lines, -18 lines 0 comments Download

Messages

Total messages: 10 (4 generated)
wdzierzanowski
ddorwin: Now with the reland fix in a separate patch set :) PTAL
4 years, 5 months ago (2016-07-14 21:23:40 UTC) #2
ddorwin
Thank you. LGTM with nit. Go ahead and CQ after fixing the nit. https://codereview.chromium.org/2149233003/diff/20001/third_party/widevine/cdm/widevine_cdm.gyp File ...
4 years, 5 months ago (2016-07-14 22:26:31 UTC) #3
wdzierzanowski
https://codereview.chromium.org/2149233003/diff/20001/third_party/widevine/cdm/widevine_cdm.gyp File third_party/widevine/cdm/widevine_cdm.gyp (right): https://codereview.chromium.org/2149233003/diff/20001/third_party/widevine/cdm/widevine_cdm.gyp#newcode202 third_party/widevine/cdm/widevine_cdm.gyp:202: # See "widevinecdm_binary" above. On 2016/07/14 22:26:31, ddorwin wrote: ...
4 years, 5 months ago (2016-07-14 23:14:50 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2149233003/40001
4 years, 5 months ago (2016-07-14 23:16:02 UTC) #7
commit-bot: I haz the power
Committed patchset #3 (id:40001)
4 years, 5 months ago (2016-07-14 23:50:44 UTC) #8
commit-bot: I haz the power
4 years, 5 months ago (2016-07-14 23:53:27 UTC) #10
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/117144d7ad598ec731f258f5272142708274d635
Cr-Commit-Position: refs/heads/master@{#405635}

Powered by Google App Engine
This is Rietveld 408576698