(reland) media: Use platform specific folders for CDMs

(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms except for Mac. On Mac, we use the default product_dir, and then copy the library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromium.org,
BUG=582622, 611990
TEST=All tests pass. Tested on Mac and Linux.

Committed: https://crrev.com/c3a252bbf7740877d2c7c515e093554de5f2b423
Cr-Commit-Position: refs/heads/master@{#395280}

[xhwang, 2016-05-22 18:12:15]

Description was changed from

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,611990
TEST=All tests pass. Tested on Mac and Linux.

Committed: https://crrev.com/e13213d846ff7bdd794588b7efd152c3b5080a8d
Cr-Commit-Position: refs/heads/master@{#395275}

patch from issue 1989893004 at patchset 100001
(http://crrev.com/1989893004#ps100001)
==========

to

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromiu...,

BUG=582622,611990
TEST=All tests pass. Tested on Mac and Linux.
==========

[xhwang, 2016-05-22 18:12:15]

xhwang@chromium.org changed reviewers:
+ ddorwin@chromium.org, rsesek@chromium.org, thestig@chromium.org

[xhwang, 2016-05-22 18:13:36]

The CQ bit was checked by xhwang@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-05-22 18:13:43]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2005703002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2005703002/20001

[commit-bot: I haz the power, 2016-05-22 20:49:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-22 20:49:46]

Dry run: Try jobs failed on following builders:
  linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[xhwang, 2016-05-23 02:28:20]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2016-05-23 02:28:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2005703002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2005703002/20001

[commit-bot: I haz the power, 2016-05-23 02:35:58]

Description was changed from

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromiu...,

BUG=582622,611990
TEST=All tests pass. Tested on Mac and Linux.
==========

to

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromiu...,

BUG=582622,611990
TEST=All tests pass. Tested on Mac and Linux.
==========

[commit-bot: I haz the power, 2016-05-23 02:36:00]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-05-23 02:37:04]

Description was changed from

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromiu...,

BUG=582622,611990
TEST=All tests pass. Tested on Mac and Linux.
==========

to

==========
(reland) media: Use platform specific folders for CDMs

This is a reland of commit e13213d846ff7bdd794588b7efd152c3b5080a8d with a minor
fix in media_cdm.gypi where we use product_dir for clearkeycdm on all platforms
except for Mac. On Mac, we use the default product_dir, and then copy the
library to the platform specific folder.

Original CL Description:

* 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,ddorwin@chromium.org,thestig@chromium.org,rsesek@chromiu...,
BUG=582622,611990
TEST=All tests pass. Tested on Mac and Linux.

Committed: https://crrev.com/c3a252bbf7740877d2c7c515e093554de5f2b423
Cr-Commit-Position: refs/heads/master@{#395280}
==========

[commit-bot: I haz the power, 2016-05-23 02:37:06]

Patchset 2 (id:??) landed as
https://crrev.com/c3a252bbf7740877d2c7c515e093554de5f2b423
Cr-Commit-Position: refs/heads/master@{#395280}

[lmilko, 2016-05-23 10:58:18]

milko.leporis@imgtec.com changed reviewers:
+ milko.leporis@imgtec.com

[lmilko, 2016-05-23 10:58:18]

https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi
File media/cdm_paths.gypi (right):

https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi#ne...
media/cdm_paths.gypi:39: 'component_arch%': '<(current_cpu)'
This should probably be target_arch instead of current_cpu (current_cpu is only
used in GN).
This broke MIPS Linux build with GYP:

http://www.rt-rk.com/mips-buildbot/builders/Chromium_linux_mips32r1_brcm7429/...

[xhwang, 2016-05-23 14:51:56]

https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi
File media/cdm_paths.gypi (right):

https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi#ne...
media/cdm_paths.gypi:39: 'component_arch%': '<(current_cpu)'
On 2016/05/23 10:58:18, lmilko wrote:
> This should probably be target_arch instead of current_cpu (current_cpu is
only
> used in GN).
> This broke MIPS Linux build with GYP:
> 
>
http://www.rt-rk.com/mips-buildbot/builders/Chromium_linux_mips32r1_brcm7429/...

Thanks! I'll take a look and fix it.

[xhwang, 2016-05-24 17:56:22]

On 2016/05/23 14:51:56, xhwang wrote:
> https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi
> File media/cdm_paths.gypi (right):
> 
>
https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi#ne...
> media/cdm_paths.gypi:39: 'component_arch%': '<(current_cpu)'
> On 2016/05/23 10:58:18, lmilko wrote:
> > This should probably be target_arch instead of current_cpu (current_cpu is
> only
> > used in GN).
> > This broke MIPS Linux build with GYP:
> > 
> >
>
http://www.rt-rk.com/mips-buildbot/builders/Chromium_linux_mips32r1_brcm7429/...
> 
> Thanks! I'll take a look and fix it.

This should've been fixed by https://codereview.chromium.org/2004253002/

[lmilko, 2016-05-25 08:03:29]

On 2016/05/24 17:56:22, xhwang wrote:
> On 2016/05/23 14:51:56, xhwang wrote:
> > https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi
> > File media/cdm_paths.gypi (right):
> > 
> >
>
https://codereview.chromium.org/2005703002/diff/20001/media/cdm_paths.gypi#ne...
> > media/cdm_paths.gypi:39: 'component_arch%': '<(current_cpu)'
> > On 2016/05/23 10:58:18, lmilko wrote:
> > > This should probably be target_arch instead of current_cpu (current_cpu is
> > only
> > > used in GN).
> > > This broke MIPS Linux build with GYP:
> > > 
> > >
> >
>
http://www.rt-rk.com/mips-buildbot/builders/Chromium_linux_mips32r1_brcm7429/...
> > 
> > Thanks! I'll take a look and fix it.
> 
> This should've been fixed by https://codereview.chromium.org/2004253002/

Thanks, issue is fixed.