GN: Enable api,media,pc and p2p for the 'webrtc' target.

webrtc/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.
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
@@ skipping 227 matching lines @@
     "config.h",
     "transport.h",
   ]
 
   defines = []
   configs += [ ":common_config" ]
   public_configs = [ ":common_inherited_config" ]
 
   deps = [
     ":webrtc_common",
-
-    #"api",  # TODO(kjellander): Enable when bugs.webrtc.org/4256 is fixed.
     "audio",
     "base:rtc_base",
     "call",
     "common_audio",
     "common_video",
-
-    #"media",    # TODO(kjellander): Enable when bugs.webrtc.org/4256 is fixed.
     "modules/audio_coding",
     "modules/audio_conference_mixer",
     "modules/audio_device",
     "modules/audio_processing",
     "modules/bitrate_controller",
     "modules/desktop_capture",
     "modules/media_file",
     "modules/rtp_rtcp",
     "modules/utility",
     "modules/video_coding",
     "modules/video_processing",
-
-    #"p2p",  # TODO(kjellander): Enable when bugs.webrtc.org/4256 is fixed.
-    #"pc",  # TODO(kjellander): Enable when bugs.webrtc.org/4256 is fixed.
     "system_wrappers",
     "tools",
     "video",
     "voice_engine",
   ]
 
   if (build_with_chromium) {
     deps += [ "modules/video_capture" ]
+  } else {
+    # TODO(kjellander): Enable for Chromium as well when bugs.webrtc.org/4256 is
+    # fixed. Right now it's not possible due to circular dependencies.
+    deps += [
+      "api",
+      "media",
+      "p2p",
+      "pc",
+    ]
   }
 
   if (rtc_enable_protobuf) {
     defines += [ "ENABLE_RTC_EVENT_LOG" ]
     deps += [ ":rtc_event_log_proto" ]
   }
 }
 
 if (!build_with_chromium) {
   executable("webrtc_tests") {
@@ skipping 305 matching lines @@
       # TODO(tkchin): Cleanup this warning.
       cflags = [ "-Wno-objc-property-no-attribute" ]
 
       # |-ObjC| flag needed to make sure category method implementations
       # are included:
       # https://developer.apple.com/library/mac/qa/qa1490/_index.html
       ldflags = [ "-ObjC" ]
     }
   }
 }