Roll chromium_revision c089d37..159828f (353662:353696) + fix GN

webrtc/build/webrtc.gni

 # 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/config/arm.gni")
 import("//build/config/mips.gni")
+import("//build_overrides/webrtc.gni")
 
 declare_args() {
-  # Assume Chromium build for now, since that's the priority case for getting GN
-  # up and running with WebRTC.
-  build_with_chromium = true
   build_with_libjingle = true
 
   # Disable this to avoid building the Opus audio codec.
   rtc_include_opus = true
 
   # Used to specify an external Jsoncpp include path when not compiling the
   # library that comes with WebRTC (i.e. rtc_build_json == 0).
   rtc_jsoncpp_root = "//third_party/jsoncpp/source/include"
 
   # Used to specify an external OpenSSL include path when not compiling the
@@ skipping 28 matching lines @@
   # Enable to use the Mozilla internal settings.
   build_with_mozilla = false
 
   rtc_enable_android_opensl = false
 
   # Link-Time Optimizations.
   # Executes code generation at link-time instead of compile-time.
   # https://gcc.gnu.org/wiki/LinkTimeOptimization
   rtc_use_lto = false
 
-  if (build_with_chromium) {
-    # Exclude pulse audio on Chromium since its prerequisites don't require
-    # pulse audio.
-    rtc_include_pulse_audio = false
-
-    # Exclude internal ADM since Chromium uses its own IO handling.
-    rtc_include_internal_audio_device = false
-  } else {
-    # Settings for the standalone (not-in-Chromium) build.
-
-    # TODO(andrew): For now, disable the Chrome plugins, which causes a
-    # flood of chromium-style warnings. Investigate enabling them:
-    # http://code.google.com/p/webrtc/issues/detail?id=163
-    clang_use_chrome_plugins = false
-
-    rtc_include_pulse_audio = true
-    rtc_include_internal_audio_device = true
-  }
-
   if (build_with_libjingle) {
     rtc_include_tests = false
     rtc_restrict_logging = true
   } else {
     rtc_include_tests = true
     rtc_restrict_logging = false
   }
 
   if (is_ios) {
     rtc_build_libjpeg = false
@@ skipping 20 matching lines @@
   # Enable this to use HW H.264 encoder/decoder on iOS PeerConnections.
   # Enabling this may break interop with Android clients that support H264.
   rtc_use_objc_h264 = false
 }
 
 # Make it possible to provide custom locations for some libraries (move these
 # up into declare_args should we need to actually use them for the GN build).
 rtc_libvpx_dir = "//third_party/libvpx_new"
 rtc_libyuv_dir = "//third_party/libyuv"
 rtc_opus_dir = "//third_party/opus"