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

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: https://chromium.googlesource.com/chromium/src/+log/2a70cb1..4662d4f
Full diff: https://chromium.googlesource.com/chromium/src/+/2a70cb1..4662d4f

Changed dependencies:
* src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/6d0c448..0f8e6e4
* src/third_party/libsrtp: https://chromium.googlesource.com/chromium/deps/libsrtp.git/+log/8a7662a..ebfcc9a
DEPS diff: https://chromium.googlesource.com/chromium/src/+/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}

1 files changed, 54 insertions, 38 deletions

diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index 8739513c01..5897176845 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -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",