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

Side by Side Diff: media/media_cdm.gypi

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 7 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
« no previous file with comments | « media/media.gyp ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 }], 69 }],
70 ['OS == "mac"', { 70 ['OS == "mac"', {
71 'xcode_settings': { 71 'xcode_settings': {
72 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 72 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
73 }, 73 },
74 }] 74 }]
75 ], 75 ],
76 'defines': ['CDM_IMPLEMENTATION'], 76 'defines': ['CDM_IMPLEMENTATION'],
77 'dependencies': [ 77 'dependencies': [
78 'media', 78 'media',
79 '../url/url.gyp:url_lib',
79 # Include the following for media::AudioBus. 80 # Include the following for media::AudioBus.
80 'shared_memory_support', 81 'shared_memory_support',
81 '<(DEPTH)/base/base.gyp:base', 82 '<(DEPTH)/base/base.gyp:base',
82 ], 83 ],
83 'sources': [ 84 'sources': [
84 'cdm/ppapi/cdm_file_io_test.cc', 85 'cdm/ppapi/cdm_file_io_test.cc',
85 'cdm/ppapi/cdm_file_io_test.h', 86 'cdm/ppapi/cdm_file_io_test.h',
86 'cdm/ppapi/external_clear_key/cdm_video_decoder.cc', 87 'cdm/ppapi/external_clear_key/cdm_video_decoder.cc',
87 'cdm/ppapi/external_clear_key/cdm_video_decoder.h', 88 'cdm/ppapi/external_clear_key/cdm_video_decoder.h',
88 'cdm/ppapi/external_clear_key/clear_key_cdm.cc', 89 'cdm/ppapi/external_clear_key/clear_key_cdm.cc',
(...skipping 21 matching lines...) Expand all
110 # Built by clearkeycdm. 111 # Built by clearkeycdm.
111 '<(PRODUCT_DIR)/libclearkeycdm.so', 112 '<(PRODUCT_DIR)/libclearkeycdm.so',
112 ], 113 ],
113 }], 114 }],
114 ], 115 ],
115 }, 116 },
116 ], 117 ],
117 }], 118 }],
118 ], 119 ],
119 } 120 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698