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

Side by Side Diff: media/media_cdm.gypi

Issue 26155003: Add CdmWrapper to support multiple CDM versions in CdmAdapter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add cdm_helpers.h Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« media/cdm/ppapi/linked_ptr.h ('K') | « media/cdm/ppapi/linked_ptr.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS == "android"', { 8 ['OS == "android"', {
9 # Android doesn't use ffmpeg. 9 # Android doesn't use ffmpeg.
10 'use_ffmpeg%': 0, 10 'use_ffmpeg%': 0,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 'target_name': 'clearkeycdmadapter', 91 'target_name': 'clearkeycdmadapter',
92 'type': 'none', 92 'type': 'none',
93 # Check whether the plugin's origin URL is valid. 93 # Check whether the plugin's origin URL is valid.
94 'defines': ['CHECK_DOCUMENT_URL'], 94 'defines': ['CHECK_DOCUMENT_URL'],
95 'dependencies': [ 95 'dependencies': [
96 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', 96 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
97 'clearkeycdm', 97 'clearkeycdm',
98 ], 98 ],
99 'sources': [ 99 'sources': [
100 'cdm/ppapi/api/content_decryption_module.h', 100 'cdm/ppapi/api/content_decryption_module.h',
101 'cdm/ppapi/cdm_adapter.h',
102 'cdm/ppapi/cdm_helpers.h',
101 'cdm/ppapi/cdm_wrapper.cc', 103 'cdm/ppapi/cdm_wrapper.cc',
102 'cdm/ppapi/linked_ptr.h', 104 'cdm/ppapi/linked_ptr.h',
103 ], 105 ],
104 'conditions': [ 106 'conditions': [
105 ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', { 107 ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
106 'cflags': ['-fvisibility=hidden'], 108 'cflags': ['-fvisibility=hidden'],
107 'type': 'loadable_module', 109 'type': 'loadable_module',
108 # Allow the plugin wrapper to find the CDM in the same directory. 110 # Allow the plugin wrapper to find the CDM in the same directory.
109 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], 111 'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
110 'libraries': [ 112 'libraries': [
(...skipping 16 matching lines...) Expand all
127 '-Wl,-exported_symbol,_PPP_InitializeModule', 129 '-Wl,-exported_symbol,_PPP_InitializeModule',
128 '-Wl,-exported_symbol,_PPP_ShutdownModule' 130 '-Wl,-exported_symbol,_PPP_ShutdownModule'
129 ], 131 ],
130 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 132 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
131 }, 133 },
132 }], 134 }],
133 ], 135 ],
134 } 136 }
135 ], 137 ],
136 } 138 }
OLDNEW
« media/cdm/ppapi/linked_ptr.h ('K') | « media/cdm/ppapi/linked_ptr.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698