diff options
| author | jrummell <jrummell@chromium.org> | 2015-10-26 17:20:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 00:20:43 +0000 |
| commit | 38ae661b252d977ce675140c6e5470204809d0c0 (patch) | |
| tree | b317da93a3968658c89deaddc23d18950c356176 /media/media_cdm_adapter.gyp | |
| parent | 0729ea1f10dd932fb4cc27a1b64b4b310a50fd2d (diff) | |
| download | chromium_src-38ae661b252d977ce675140c6e5470204809d0c0.zip chromium_src-38ae661b252d977ce675140c6e5470204809d0c0.tar.gz chromium_src-38ae661b252d977ce675140c6e5470204809d0c0.tar.bz2 | |
Rename cdm_adapter to ppapi_cdm_adapter
As the current cdm_adapter is specific to ppapi, rename it to make it
clearer. This also moves some of the generic files out of the ppapi
folder so that they can be used by other implementations.
TEST=compiles
Review URL: https://codereview.chromium.org/1402413005
Cr-Commit-Position: refs/heads/master@{#356196}
Diffstat (limited to 'media/media_cdm_adapter.gyp')
| -rw-r--r-- | media/media_cdm_adapter.gyp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/media/media_cdm_adapter.gyp b/media/media_cdm_adapter.gyp index 0b9cab8..8c81df1 100644 --- a/media/media_cdm_adapter.gyp +++ b/media/media_cdm_adapter.gyp @@ -17,23 +17,26 @@ 'targets': [ { # GN version: Use the template cdm_adapter in - # //media/cdm/ppapi/cdm_adapter.gni. + # //media/cdm/ppapi/ppapi_cdm_adapter.gni. 'target_name': 'cdmadapter', 'type': 'none', 'direct_dependent_settings': { + 'defines': [ + 'USE_PPAPI_CDM_ADAPTER', + ], 'sources': [ 'cdm/api/content_decryption_module.h', - 'cdm/ppapi/cdm_adapter.cc', - 'cdm/ppapi/cdm_adapter.h', + 'cdm/cdm_wrapper.h', + 'cdm/ppapi/ppapi_cdm_adapter.cc', + 'cdm/ppapi/ppapi_cdm_adapter.h', 'cdm/ppapi/cdm_file_io_impl.cc', 'cdm/ppapi/cdm_file_io_impl.h', 'cdm/ppapi/cdm_helpers.cc', 'cdm/ppapi/cdm_helpers.h', 'cdm/ppapi/cdm_logging.cc', 'cdm/ppapi/cdm_logging.h', - 'cdm/ppapi/cdm_wrapper.h', 'cdm/ppapi/linked_ptr.h', - 'cdm/ppapi/supported_cdm_versions.h', + 'cdm/supported_cdm_versions.h', ], 'conditions': [ ['os_posix == 1 and OS != "mac"', { |