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

Side by Side Diff: third_party/widevine/cdm/widevine_cdm.gyp

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 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 | « ppapi/shared_impl/DEPS ('k') | webkit/DEPS » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'widevine_cdm_version_h_file%': 'widevine_cdm_version.h', 7 'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
8 'widevine_cdm_binary_files%': [], 8 'widevine_cdm_binary_files%': [],
9 'conditions': [ 9 'conditions': [
10 [ 'branding == "Chrome"', { 10 [ 'branding == "Chrome"', {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 'target_name': 'widevinecdmadapter', 49 'target_name': 'widevinecdmadapter',
50 'type': 'none', 50 'type': 'none',
51 'conditions': [ 51 'conditions': [
52 [ 'branding == "Chrome" and enable_pepper_cdms==1', { 52 [ 'branding == "Chrome" and enable_pepper_cdms==1', {
53 'dependencies': [ 53 'dependencies': [
54 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', 54 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
55 'widevine_cdm_version_h', 55 'widevine_cdm_version_h',
56 'widevine_cdm_binaries', 56 'widevine_cdm_binaries',
57 ], 57 ],
58 'sources': [ 58 'sources': [
59 '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc', 59 '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h',
60 '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm/content_decryption_ module.h', 60 '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.cc',
61 '<(DEPTH)/webkit/renderer/media/crypto/ppapi/linked_ptr.h', 61 '<(DEPTH)/media/cdm/ppapi/linked_ptr.h',
62 ], 62 ],
63 'conditions': [ 63 'conditions': [
64 [ 'os_posix == 1 and OS != "mac"', { 64 [ 'os_posix == 1 and OS != "mac"', {
65 'cflags': ['-fvisibility=hidden'], 65 'cflags': ['-fvisibility=hidden'],
66 'type': 'loadable_module', 66 'type': 'loadable_module',
67 # Allow the plugin wrapper to find the CDM in the same directory. 67 # Allow the plugin wrapper to find the CDM in the same directory.
68 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], 68 'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
69 'libraries': [ 69 'libraries': [
70 # Copied by widevine_cdm_binaries. 70 # Copied by widevine_cdm_binaries.
71 '<(PRODUCT_DIR)/libwidevinecdm.so', 71 '<(PRODUCT_DIR)/libwidevinecdm.so',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ], 121 ],
122 'copies': [{ 122 'copies': [{
123 # TODO(ddorwin): Do we need a sub-directory? We either need a 123 # TODO(ddorwin): Do we need a sub-directory? We either need a
124 # sub-directory or to rename manifest.json before we can copy it. 124 # sub-directory or to rename manifest.json before we can copy it.
125 'destination': '<(PRODUCT_DIR)', 125 'destination': '<(PRODUCT_DIR)',
126 'files': [ '<@(widevine_cdm_binary_files)' ], 126 'files': [ '<@(widevine_cdm_binary_files)' ],
127 }], 127 }],
128 }, 128 },
129 ], 129 ],
130 } 130 }
OLDNEW
« no previous file with comments | « ppapi/shared_impl/DEPS ('k') | webkit/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698