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

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: rebase only 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
« no previous file with comments | « media/cdm/ppapi/linked_ptr.h ('k') | third_party/widevine/cdm/widevine_cdm.gyp » ('j') | 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
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.cc', 101 'cdm/ppapi/cdm_adapter.cc',
102 'cdm/ppapi/cdm_adapter.h', 102 'cdm/ppapi/cdm_adapter.h',
103 'cdm/ppapi/cdm_helpers.cc', 103 'cdm/ppapi/cdm_helpers.cc',
104 'cdm/ppapi/cdm_helpers.h', 104 'cdm/ppapi/cdm_helpers.h',
105 'cdm/ppapi/cdm_wrapper.h',
105 'cdm/ppapi/linked_ptr.h', 106 'cdm/ppapi/linked_ptr.h',
106 ], 107 ],
107 'conditions': [ 108 'conditions': [
108 ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', { 109 ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
109 'cflags': ['-fvisibility=hidden'], 110 'cflags': ['-fvisibility=hidden'],
110 'type': 'loadable_module', 111 'type': 'loadable_module',
111 # Allow the plugin adapter to find the CDM in the same directory. 112 # Allow the plugin adapter to find the CDM in the same directory.
112 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], 113 'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
113 'libraries': [ 114 'libraries': [
114 # Built by clearkeycdm. 115 # Built by clearkeycdm.
(...skipping 15 matching lines...) Expand all
130 '-Wl,-exported_symbol,_PPP_InitializeModule', 131 '-Wl,-exported_symbol,_PPP_InitializeModule',
131 '-Wl,-exported_symbol,_PPP_ShutdownModule' 132 '-Wl,-exported_symbol,_PPP_ShutdownModule'
132 ], 133 ],
133 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 134 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
134 }, 135 },
135 }], 136 }],
136 ], 137 ],
137 } 138 }
138 ], 139 ],
139 } 140 }
OLDNEW
« no previous file with comments | « media/cdm/ppapi/linked_ptr.h ('k') | third_party/widevine/cdm/widevine_cdm.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698