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

Side by Side Diff: media/media.gyp

Issue 10961015: Android: MediaPlayerBridge JNI cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
« no previous file with comments | « media/base/android/media_player_listener.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 '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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 'includes': [ '../build/apk_test.gypi' ], 1149 'includes': [ '../build/apk_test.gypi' ],
1150 }, 1150 },
1151 ], 1151 ],
1152 }], 1152 }],
1153 ['OS == "android"', { 1153 ['OS == "android"', {
1154 'targets': [ 1154 'targets': [
1155 { 1155 {
1156 'target_name': 'player_android_jni_headers', 1156 'target_name': 'player_android_jni_headers',
1157 'type': 'none', 1157 'type': 'none',
1158 'sources': [ 1158 'sources': [
1159 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1159 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1160 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1160 ], 1161 ],
1161 'variables': { 1162 'variables': {
1162 'jni_gen_dir': 'media', 1163 'jni_gen_dir': 'media',
1163 }, 1164 },
1164 'includes': [ '../build/jni_generator.gypi' ], 1165 'includes': [ '../build/jni_generator.gypi' ],
1165 }, 1166 },
1166 { 1167 {
1167 'target_name': 'player_android', 1168 'target_name': 'player_android',
1168 'type': 'static_library', 1169 'type': 'static_library',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 'media', 1288 'media',
1288 ], 1289 ],
1289 'sources': [ 1290 'sources': [
1290 'tools/media_bench/media_bench.cc', 1291 'tools/media_bench/media_bench.cc',
1291 ], 1292 ],
1292 }, 1293 },
1293 ], 1294 ],
1294 }] 1295 }]
1295 ], 1296 ],
1296 } 1297 }
OLDNEW
« no previous file with comments | « media/base/android/media_player_listener.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698