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

Side by Side Diff: media/media.gyp

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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
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 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 'audio/win/audio_manager_win.cc', 140 'audio/win/audio_manager_win.cc',
141 'audio/win/audio_manager_win.h', 141 'audio/win/audio_manager_win.h',
142 'audio/win/avrt_wrapper_win.cc', 142 'audio/win/avrt_wrapper_win.cc',
143 'audio/win/avrt_wrapper_win.h', 143 'audio/win/avrt_wrapper_win.h',
144 'audio/win/device_enumeration_win.cc', 144 'audio/win/device_enumeration_win.cc',
145 'audio/win/device_enumeration_win.h', 145 'audio/win/device_enumeration_win.h',
146 'audio/win/wavein_input_win.cc', 146 'audio/win/wavein_input_win.cc',
147 'audio/win/wavein_input_win.h', 147 'audio/win/wavein_input_win.h',
148 'audio/win/waveout_output_win.cc', 148 'audio/win/waveout_output_win.cc',
149 'audio/win/waveout_output_win.h', 149 'audio/win/waveout_output_win.h',
150 'base/android/cookie_getter.cc',
151 'base/android/cookie_getter.h',
150 'base/android/media_jni_registrar.cc', 152 'base/android/media_jni_registrar.cc',
151 'base/android/media_jni_registrar.h', 153 'base/android/media_jni_registrar.h',
154 'base/android/media_player_bridge_manager.cc',
155 'base/android/media_player_bridge_manager.h',
152 'base/audio_decoder.cc', 156 'base/audio_decoder.cc',
153 'base/audio_decoder.h', 157 'base/audio_decoder.h',
154 'base/audio_decoder_config.cc', 158 'base/audio_decoder_config.cc',
155 'base/audio_decoder_config.h', 159 'base/audio_decoder_config.h',
156 'base/audio_fifo.cc', 160 'base/audio_fifo.cc',
157 'base/audio_fifo.h', 161 'base/audio_fifo.h',
158 'base/audio_pull_fifo.cc', 162 'base/audio_pull_fifo.cc',
159 'base/audio_pull_fifo.h', 163 'base/audio_pull_fifo.h',
160 'base/audio_renderer.cc', 164 'base/audio_renderer.cc',
161 'base/audio_renderer.h', 165 'base/audio_renderer.h',
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 'jni_gen_dir': 'media', 1150 'jni_gen_dir': 'media',
1147 }, 1151 },
1148 'includes': [ '../build/jni_generator.gypi' ], 1152 'includes': [ '../build/jni_generator.gypi' ],
1149 }, 1153 },
1150 { 1154 {
1151 'target_name': 'player_android', 1155 'target_name': 'player_android',
1152 'type': 'static_library', 1156 'type': 'static_library',
1153 'sources': [ 1157 'sources': [
1154 'base/android/media_player_bridge.cc', 1158 'base/android/media_player_bridge.cc',
1155 'base/android/media_player_bridge.h', 1159 'base/android/media_player_bridge.h',
1160 'base/android/media_player_listener.cc',
1161 'base/android/media_player_listener.h',
1156 ], 1162 ],
1157 'dependencies': [ 1163 'dependencies': [
1158 '../base/base.gyp:base', 1164 '../base/base.gyp:base',
1159 'player_android_jni_headers', 1165 'player_android_jni_headers',
1160 ], 1166 ],
1161 'include_dirs': [ 1167 'include_dirs': [
1162 '<(SHARED_INTERMEDIATE_DIR)/media', 1168 '<(SHARED_INTERMEDIATE_DIR)/media',
1163 ], 1169 ],
1164 }, 1170 },
1165 { 1171 {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 'media', 1275 'media',
1270 ], 1276 ],
1271 'sources': [ 1277 'sources': [
1272 'tools/media_bench/media_bench.cc', 1278 'tools/media_bench/media_bench.cc',
1273 ], 1279 ],
1274 }, 1280 },
1275 ], 1281 ],
1276 }] 1282 }]
1277 ], 1283 ],
1278 } 1284 }
OLDNEW
« no previous file with comments | « media/base/android/media_player_listener.cc ('k') | webkit/media/android/media_player_bridge_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698