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

webrtc/modules/audio_device/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../build/webrtc.gni")
 
@@ skipping 36 matching lines @@
     include_dirs += [ "win" ]
   }
   if (is_android) {
     include_dirs += [ "android" ]
   }
   defines = []
   cflags = []
   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",

[kjellander_webrtc, 2016/01/07 10:49:48]

build_info.* was also missing. We need to keep these in sync when adding new
code!

+        "android/build_info.h",
+        "android/opensles_common.cc",
+        "android/opensles_common.h",
+        "android/opensles_player.cc",
+        "android/opensles_player.h",
+      ]
+      libs = [
+        "log",
+        "OpenSLES",

[kjellander_webrtc, 2016/01/07 10:49:48]

This was missing and was causing the compilation failure.

+      ]
+    }
     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",
           "linux/audio_device_pulse_linux.h",
           "linux/audio_mixer_manager_pulse_linux.cc",
           "linux/audio_mixer_manager_pulse_linux.h",
           "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",

[kjellander_webrtc, 2016/01/07 10:49:48]

This file was also missing.

+      ]
       cflags += [ "-fobjc-arc" ]  # CLANG_ENABLE_OBJC_ARC = YES.
-
       libs = [
         "AudioToolbox.framework",
         "AVFoundation.framework",
         "Foundation.framework",
+        "UIKit.framework",

[kjellander_webrtc, 2016/01/07 10:49:48]

Finally this lib was missing in the GN build.

       ]
     }
     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",
         "wmcodecdspuuid.lib",
         "amstrmid.lib",
         "msdmo.lib",
       ]
     }
   } else {
     defines = [ "WEBRTC_DUMMY_AUDIO_BUILD" ]
@@ skipping 20 matching lines @@
   }
 
   deps = [
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
     "../utility",
   ]
 }