zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio_device: Move sources into platform-conditions.

Browse Source 
This should solve a problem discovered when converting from GYP to
other project formats, where the source files weren't included correctly
for each platform.

Two other targets in WebRTC have similar source files, which are correctly
generated for each platform:
* video_render_module_internal_impl
* video_capture_module_internal_impl
They both list the sources as it's changed to in this CL.

NOTRY=True

Review URL: https://codereview.webrtc.org/1536923003

Cr-Commit-Position: refs/heads/master@{#11083}
This commit is contained in:
kjellander
2015-12-18 04:33:27 -08:00
committed by Commit bot
parent 9b7fc7f25d
commit 6c6510afad
1 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
webrtc/modules/audio_device/audio_device.gypi
View File

@ -86,48 +86,26 @@
}], }],
['include_internal_audio_device==1', { ['include_internal_audio_device==1', {
'sources': [ 'sources': [
'android/audio_device_template.h',
'android/audio_manager.cc',
'android/audio_manager.h',
'android/audio_record_jni.cc',
'android/audio_record_jni.h',
'android/audio_track_jni.cc',
'android/audio_track_jni.h',
'android/build_info.cc',
'android/build_info.h',
'android/opensles_common.cc',
'android/opensles_common.h',
'android/opensles_player.cc',
'android/opensles_player.h',
'audio_device_impl.cc', 'audio_device_impl.cc',
'audio_device_impl.h', 'audio_device_impl.h',
'ios/audio_device_ios.h',
'ios/audio_device_ios.mm',
'ios/audio_device_not_implemented_ios.mm',
'linux/alsasymboltable_linux.cc',
'linux/alsasymboltable_linux.h',
'linux/audio_device_alsa_linux.cc',
'linux/audio_device_alsa_linux.h',
'linux/audio_mixer_manager_alsa_linux.cc',
'linux/audio_mixer_manager_alsa_linux.h',
'linux/latebindingsymboltable_linux.cc',
'linux/latebindingsymboltable_linux.h',
'mac/audio_device_mac.cc',
'mac/audio_device_mac.h',
'mac/audio_mixer_manager_mac.cc',
'mac/audio_mixer_manager_mac.h',
'mac/portaudio/pa_memorybarrier.h',
'mac/portaudio/pa_ringbuffer.c',
'mac/portaudio/pa_ringbuffer.h',
'win/audio_device_core_win.cc',
'win/audio_device_core_win.h',
'win/audio_device_wave_win.cc',
'win/audio_device_wave_win.h',
'win/audio_mixer_manager_win.cc',
'win/audio_mixer_manager_win.h',
], ],
'conditions': [ 'conditions': [
['OS=="android"', { ['OS=="android"', {
'sources': [
'android/audio_device_template.h',
'android/audio_manager.cc',
'android/audio_manager.h',
'android/audio_record_jni.cc',
'android/audio_record_jni.h',
'android/audio_track_jni.cc',
'android/audio_track_jni.h',
'android/build_info.cc',
'android/build_info.h',
'android/opensles_common.cc',
'android/opensles_common.h',
'android/opensles_player.cc',
'android/opensles_player.h',
],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-llog', '-llog',
@ -136,6 +114,16 @@
}, },
}], }],
['OS=="linux"', { ['OS=="linux"', {
'sources': [
'linux/alsasymboltable_linux.cc',
'linux/alsasymboltable_linux.h',
'linux/audio_device_alsa_linux.cc',
'linux/audio_device_alsa_linux.h',
'linux/audio_mixer_manager_alsa_linux.cc',
'linux/audio_mixer_manager_alsa_linux.h',
'linux/latebindingsymboltable_linux.cc',
'linux/latebindingsymboltable_linux.h',
],
'defines': [ 'defines': [
'LINUX_ALSA', 'LINUX_ALSA',
], ],
@ -161,6 +149,15 @@
], ],
}], }],
['OS=="mac"', { ['OS=="mac"', {
'sources': [
'mac/audio_device_mac.cc',
'mac/audio_device_mac.h',
'mac/audio_mixer_manager_mac.cc',
'mac/audio_mixer_manager_mac.h',
'mac/portaudio/pa_memorybarrier.h',
'mac/portaudio/pa_ringbuffer.c',
'mac/portaudio/pa_ringbuffer.h',
],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
@ -169,6 +166,11 @@
}, },
}], }],
['OS=="ios"', { ['OS=="ios"', {
'sources': [
'ios/audio_device_ios.h',
'ios/audio_device_ios.mm',
'ios/audio_device_not_implemented_ios.mm',
],
'xcode_settings': { 'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_OBJC_ARC': 'YES',
}, },
@ -184,6 +186,14 @@
}, },
}], }],
['OS=="win"', { ['OS=="win"', {
'sources': [
'win/audio_device_core_win.cc',
'win/audio_device_core_win.h',
'win/audio_device_wave_win.cc',
'win/audio_device_wave_win.h',
'win/audio_mixer_manager_win.cc',
'win/audio_mixer_manager_win.h',
],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# Required for the built-in WASAPI AEC. # Required for the built-in WASAPI AEC.