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

Side by Side Diff: webkit/media/webkit_media.gypi

Issue 12961009: Make webkit_media.gyp depend on cc.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « no previous file | 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 (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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 16 matching lines...) Expand all
27 { 27 {
28 'target_name': 'webkit_media', 28 'target_name': 'webkit_media',
29 'type': 'static_library', 29 'type': 'static_library',
30 'variables': { 'enable_wexit_time_destructors': 1, }, 30 'variables': { 'enable_wexit_time_destructors': 1, },
31 'include_dirs': [ 31 'include_dirs': [
32 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc. 32 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc.
33 ], 33 ],
34 'dependencies': [ 34 'dependencies': [
35 '<(DEPTH)/base/base.gyp:base', 35 '<(DEPTH)/base/base.gyp:base',
36 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 36 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
37 '<(DEPTH)/cc/cc.gyp:cc',
37 '<(DEPTH)/media/media.gyp:media', 38 '<(DEPTH)/media/media.gyp:media',
38 '<(DEPTH)/media/media.gyp:shared_memory_support', 39 '<(DEPTH)/media/media.gyp:shared_memory_support',
39 '<(DEPTH)/media/media.gyp:yuv_convert', 40 '<(DEPTH)/media/media.gyp:yuv_convert',
40 '<(DEPTH)/skia/skia.gyp:skia', 41 '<(DEPTH)/skia/skia.gyp:skia',
41 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h', 42 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h',
42 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_bindings', 43 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_bindings',
43 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 44 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
44 ], 45 ],
45 'sources': [ 46 'sources': [
46 'android/audio_decoder_android.cc', 47 'android/audio_decoder_android.cc',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 244 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
244 '<(PRODUCT_DIR)/ffmpegsumo.so' 245 '<(PRODUCT_DIR)/ffmpegsumo.so'
245 ] 246 ]
246 } 247 }
247 ] 248 ]
248 }], 249 }],
249 ], 250 ],
250 } 251 }
251 ], 252 ],
252 } 253 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698