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

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 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'audio/win/audio_manager_win.cc', 148 'audio/win/audio_manager_win.cc',
149 'audio/win/audio_manager_win.h', 149 'audio/win/audio_manager_win.h',
150 'audio/win/avrt_wrapper_win.cc', 150 'audio/win/avrt_wrapper_win.cc',
151 'audio/win/avrt_wrapper_win.h', 151 'audio/win/avrt_wrapper_win.h',
152 'audio/win/device_enumeration_win.cc', 152 'audio/win/device_enumeration_win.cc',
153 'audio/win/device_enumeration_win.h', 153 'audio/win/device_enumeration_win.h',
154 'audio/win/wavein_input_win.cc', 154 'audio/win/wavein_input_win.cc',
155 'audio/win/wavein_input_win.h', 155 'audio/win/wavein_input_win.h',
156 'audio/win/waveout_output_win.cc', 156 'audio/win/waveout_output_win.cc',
157 'audio/win/waveout_output_win.h', 157 'audio/win/waveout_output_win.h',
158 'base/android/cookies_retriever.h',
158 'base/android/media_jni_registrar.cc', 159 'base/android/media_jni_registrar.cc',
159 'base/android/media_jni_registrar.h', 160 'base/android/media_jni_registrar.h',
161 'base/android/media_player_bridge_manager.h',
160 'base/audio_decoder.cc', 162 'base/audio_decoder.cc',
161 'base/audio_decoder.h', 163 'base/audio_decoder.h',
162 'base/audio_decoder_config.cc', 164 'base/audio_decoder_config.cc',
163 'base/audio_decoder_config.h', 165 'base/audio_decoder_config.h',
164 'base/audio_renderer.cc', 166 'base/audio_renderer.cc',
165 'base/audio_renderer.h', 167 'base/audio_renderer.h',
166 'base/audio_renderer_mixer.cc', 168 'base/audio_renderer_mixer.cc',
167 'base/audio_renderer_mixer.h', 169 'base/audio_renderer_mixer.h',
168 'base/audio_renderer_mixer_input.cc', 170 'base/audio_renderer_mixer_input.cc',
169 'base/audio_renderer_mixer_input.h', 171 'base/audio_renderer_mixer_input.h',
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 'jni_gen_dir': 'media', 1057 'jni_gen_dir': 'media',
1056 }, 1058 },
1057 'includes': [ '../build/jni_generator.gypi' ], 1059 'includes': [ '../build/jni_generator.gypi' ],
1058 }, 1060 },
1059 { 1061 {
1060 'target_name': 'player_android', 1062 'target_name': 'player_android',
1061 'type': 'static_library', 1063 'type': 'static_library',
1062 'sources': [ 1064 'sources': [
1063 'base/android/media_player_bridge.cc', 1065 'base/android/media_player_bridge.cc',
1064 'base/android/media_player_bridge.h', 1066 'base/android/media_player_bridge.h',
1067 'base/android/media_player_listener.cc',
1068 'base/android/media_player_listener.h',
1065 ], 1069 ],
1066 'dependencies': [ 1070 'dependencies': [
1067 '../base/base.gyp:base', 1071 '../base/base.gyp:base',
1068 'player_android_jni_headers', 1072 'player_android_jni_headers',
1069 ], 1073 ],
1070 'include_dirs': [ 1074 'include_dirs': [
1071 '<(SHARED_INTERMEDIATE_DIR)/media', 1075 '<(SHARED_INTERMEDIATE_DIR)/media',
1072 ], 1076 ],
1073 }, 1077 },
1074 { 1078 {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 'media', 1180 'media',
1177 ], 1181 ],
1178 'sources': [ 1182 'sources': [
1179 'tools/media_bench/media_bench.cc', 1183 'tools/media_bench/media_bench.cc',
1180 ], 1184 ],
1181 }, 1185 },
1182 ], 1186 ],
1183 }] 1187 }]
1184 ], 1188 ],
1185 } 1189 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698