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

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

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/android/media_player_bridge_manager_impl.cc ('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 (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 27 matching lines...) Expand all
38 '<(DEPTH)/media/media.gyp:media', 38 '<(DEPTH)/media/media.gyp:media',
39 '<(DEPTH)/media/media.gyp:shared_memory_support', 39 '<(DEPTH)/media/media.gyp:shared_memory_support',
40 '<(DEPTH)/media/media.gyp:yuv_convert', 40 '<(DEPTH)/media/media.gyp:yuv_convert',
41 '<(DEPTH)/skia/skia.gyp:skia', 41 '<(DEPTH)/skia/skia.gyp:skia',
42 '<(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',
43 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_bindings', 43 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_bindings',
44 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 44 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
45 ], 45 ],
46 'sources': [ 46 'sources': [
47 'android/audio_decoder_android.cc', 47 'android/audio_decoder_android.cc',
48 'android/media_player_bridge_manager_impl.cc',
49 'android/media_player_bridge_manager_impl.h',
50 'android/stream_texture_factory_android.h', 48 'android/stream_texture_factory_android.h',
51 'android/webmediaplayer_android.cc', 49 'android/webmediaplayer_android.cc',
52 'android/webmediaplayer_android.h', 50 'android/webmediaplayer_android.h',
53 'android/webmediaplayer_manager_android.cc', 51 'android/webmediaplayer_manager_android.cc',
54 'android/webmediaplayer_manager_android.h', 52 'android/webmediaplayer_manager_android.h',
55 'android/webmediaplayer_proxy_android.cc', 53 'android/webmediaplayer_proxy_android.cc',
56 'android/webmediaplayer_proxy_android.h', 54 'android/webmediaplayer_proxy_android.h',
57 'active_loader.cc', 55 'active_loader.cc',
58 'active_loader.h', 56 'active_loader.h',
59 'audio_decoder.cc', 57 'audio_decoder.cc',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 249 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
252 '<(PRODUCT_DIR)/ffmpegsumo.so' 250 '<(PRODUCT_DIR)/ffmpegsumo.so'
253 ] 251 ]
254 } 252 }
255 ] 253 ]
256 }], 254 }],
257 ], 255 ],
258 } 256 }
259 ], 257 ],
260 } 258 }
OLDNEW
« no previous file with comments | « webkit/media/android/media_player_bridge_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698