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

Side by Side Diff: media/media.gyp

Issue 9655023: Adding input and output audio backend to Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased && addressed qinmin's comments Created 8 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 | 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'audio/audio_output_proxy.cc', 50 'audio/audio_output_proxy.cc',
51 'audio/audio_output_proxy.h', 51 'audio/audio_output_proxy.h',
52 'audio/audio_parameters.cc', 52 'audio/audio_parameters.cc',
53 'audio/audio_parameters.h', 53 'audio/audio_parameters.h',
54 'audio/audio_util.cc', 54 'audio/audio_util.cc',
55 'audio/audio_util.h', 55 'audio/audio_util.h',
56 'audio/android/audio_manager_android.cc', 56 'audio/android/audio_manager_android.cc',
57 'audio/android/audio_manager_android.h', 57 'audio/android/audio_manager_android.h',
58 'audio/android/audio_track_output_android.cc', 58 'audio/android/audio_track_output_android.cc',
59 'audio/android/audio_track_output_android.h', 59 'audio/android/audio_track_output_android.h',
60 'audio/android/opensles_input.cc',
61 'audio/android/opensles_input.h',
62 'audio/android/opensles_output.cc',
63 'audio/android/opensles_output.h',
60 'audio/cross_process_notification.cc', 64 'audio/cross_process_notification.cc',
61 'audio/cross_process_notification.h', 65 'audio/cross_process_notification.h',
62 'audio/cross_process_notification_win.cc', 66 'audio/cross_process_notification_win.cc',
63 'audio/cross_process_notification_posix.cc', 67 'audio/cross_process_notification_posix.cc',
64 'audio/fake_audio_input_stream.cc', 68 'audio/fake_audio_input_stream.cc',
65 'audio/fake_audio_input_stream.h', 69 'audio/fake_audio_input_stream.h',
66 'audio/fake_audio_output_stream.cc', 70 'audio/fake_audio_output_stream.cc',
67 'audio/fake_audio_output_stream.h', 71 'audio/fake_audio_output_stream.h',
68 'audio/linux/audio_manager_linux.cc', 72 'audio/linux/audio_manager_linux.cc',
69 'audio/linux/audio_manager_linux.h', 73 'audio/linux/audio_manager_linux.h',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 # The below 'android' condition were added temporarily and should be 321 # The below 'android' condition were added temporarily and should be
318 # removed in downstream, because there is no Java environment setup in 322 # removed in downstream, because there is no Java environment setup in
319 # upstream yet. 323 # upstream yet.
320 ['OS == "android"', { 324 ['OS == "android"', {
321 'sources!':[ 325 'sources!':[
322 'audio/android/audio_track_output_android.cc', 326 'audio/android/audio_track_output_android.cc',
323 ], 327 ],
324 'sources':[ 328 'sources':[
325 'audio/android/audio_track_output_stub_android.cc', 329 'audio/android/audio_track_output_stub_android.cc',
326 ], 330 ],
331 'link_settings': {
332 'libraries': [
333 '-lOpenSLES',
334 ],
335 },
327 }], 336 }],
328 ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { 337 ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
329 'link_settings': { 338 'link_settings': {
330 'libraries': [ 339 'libraries': [
331 '-lasound', 340 '-lasound',
332 ], 341 ],
333 }, 342 },
334 }], 343 }],
335 ['OS=="openbsd"', { 344 ['OS=="openbsd"', {
336 'sources/': [ ['exclude', '/alsa_' ], 345 'sources/': [ ['exclude', '/alsa_' ],
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1011 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1003 ], 1012 ],
1004 'sources': [ 1013 'sources': [
1005 'tools/media_bench/media_bench.cc', 1014 'tools/media_bench/media_bench.cc',
1006 ], 1015 ],
1007 }, 1016 },
1008 ], 1017 ],
1009 }] 1018 }]
1010 ], 1019 ],
1011 } 1020 }
OLDNEW
« media/audio/android/opensles_util.h ('K') | « media/audio/audio_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698