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

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

Issue 13084005: Add WebAudio impulse responses Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add WebAudio impulse responses Created 7 years, 8 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 | « webkit/media/android/webaudio_assets_impl_android.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 30 matching lines...) Expand all
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', 48 'android/media_player_bridge_manager_impl.cc',
49 'android/media_player_bridge_manager_impl.h', 49 'android/media_player_bridge_manager_impl.h',
50 'android/stream_texture_factory_android.h', 50 'android/stream_texture_factory_android.h',
51 'android/webaudio_assets_impl_android.cc',
52 'android/webaudio_assets_impl_android.h',
51 'android/webmediaplayer_android.cc', 53 'android/webmediaplayer_android.cc',
52 'android/webmediaplayer_android.h', 54 'android/webmediaplayer_android.h',
53 'android/webmediaplayer_impl_android.cc', 55 'android/webmediaplayer_impl_android.cc',
54 'android/webmediaplayer_impl_android.h', 56 'android/webmediaplayer_impl_android.h',
55 'android/webmediaplayer_manager_android.cc', 57 'android/webmediaplayer_manager_android.cc',
56 'android/webmediaplayer_manager_android.h', 58 'android/webmediaplayer_manager_android.h',
57 'android/webmediaplayer_proxy_android.cc', 59 'android/webmediaplayer_proxy_android.cc',
58 'android/webmediaplayer_proxy_android.h', 60 'android/webmediaplayer_proxy_android.h',
59 'active_loader.cc', 61 'active_loader.cc',
60 'active_loader.h', 62 'active_loader.h',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 'filter_helpers.cc', 115 'filter_helpers.cc',
114 'filter_helpers.h', 116 'filter_helpers.h',
115 'webmediaplayer_impl.cc', 117 'webmediaplayer_impl.cc',
116 'webmediaplayer_impl.h', 118 'webmediaplayer_impl.h',
117 'webmediaplayer_proxy.cc', 119 'webmediaplayer_proxy.cc',
118 'webmediaplayer_proxy.h', 120 'webmediaplayer_proxy.h',
119 ], 121 ],
120 'dependencies': [ 122 'dependencies': [
121 '<(DEPTH)/media/media.gyp:player_android', 123 '<(DEPTH)/media/media.gyp:player_android',
122 ], 124 ],
125 'link_settings':{
126 'libraries' : [
127 '-landroid',
128 ],
129 }
123 }, { # OS != "android"' 130 }, { # OS != "android"'
124 'sources/': [ 131 'sources/': [
125 ['exclude', '^android/'], 132 ['exclude', '^android/'],
126 ], 133 ],
127 }], 134 }],
128 ], 135 ],
129 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 136 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
130 'msvs_disabled_warnings': [ 4267, ], 137 'msvs_disabled_warnings': [ 4267, ],
131 }, 138 },
132 { 139 {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 251 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
245 '<(PRODUCT_DIR)/ffmpegsumo.so' 252 '<(PRODUCT_DIR)/ffmpegsumo.so'
246 ] 253 ]
247 } 254 }
248 ] 255 ]
249 }], 256 }],
250 ], 257 ],
251 } 258 }
252 ], 259 ],
253 } 260 }
OLDNEW
« no previous file with comments | « webkit/media/android/webaudio_assets_impl_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698