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

Roll chromium_revision 2a70cb1..4662d4f (367468:368042)

Browse Source 
I had to fix the audio_device BUILD.gn which was forgotten back
in https://codereview.webrtc.org/1536923003. It also contained a few
missing source files and one library.

Change log: 2a70cb1..4662d4f
Full diff: 2a70cb1..4662d4f

Changed dependencies:
* src/buildtools: 6d0c448..0f8e6e4
* src/third_party/libsrtp: 8a7662a..ebfcc9a
DEPS diff: 2a70cb1..4662d4f/DEPS

No update to Clang.

TBR=henrika@webrtc.org
NOTRY=True

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

Cr-Commit-Position: refs/heads/master@{#11162}
This commit is contained in:
kjellander
2016-01-07 02:54:22 -08:00
committed by Commit bot
parent 1fe48a5e1d
commit a46a4c92d0
2 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '2a70cb124470b734b014caf94e0a550850917e5e',
'chromium_revision': '4662d4fd92789d18a63d7247818da24404b0fb69',
}
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

92
webrtc/modules/audio_device/BUILD.gn
View File

@ -54,51 +54,46 @@ source_set("audio_device") {
if (rtc_include_internal_audio_device) {
defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ]
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/opensles_common.cc",
"android/opensles_common.h",
"android/opensles_player.cc",
"android/opensles_player.h",
"audio_device_impl.cc",
"audio_device_impl.h",
"ios/audio_device_ios.h",
"ios/audio_device_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",
]
if (is_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",
]
libs = [
"log",
"OpenSLES",
]
}
if (is_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 += [ "LINUX_ALSA" ]
libs = [
"dl",
"X11",
]
if (rtc_include_pulse_audio) {
sources += [
"linux/audio_device_pulse_linux.cc",
@ -108,26 +103,47 @@ source_set("audio_device") {
"linux/pulseaudiosymboltable_linux.cc",
"linux/pulseaudiosymboltable_linux.h",
]
defines += [ "LINUX_PULSE" ]
}
}
if (is_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",
]
libs = [
"AudioToolbox.framework",
"CoreAudio.framework",
]
}
if (is_ios) {
sources += [
"ios/audio_device_ios.h",
"ios/audio_device_ios.mm",
"ios/audio_device_not_implemented_ios.mm",
]
cflags += [ "-fobjc-arc" ] # CLANG_ENABLE_OBJC_ARC = YES.
libs = [
"AudioToolbox.framework",
"AVFoundation.framework",
"Foundation.framework",
"UIKit.framework",
]
}
if (is_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",
]
libs = [
# Required for the built-in WASAPI AEC.
"dmoguids.lib",