From ab97e18fa97a73d8ad0ac51c11d7111dd397984d Mon Sep 17 00:00:00 2001 From: zhihuang Date: Thu, 22 Jun 2017 01:28:59 -0700 Subject: [PATCH] Fix the binary size regression on Chromium Windows. There is a dependency chain from Chromium windows main_dll to Opus which should never exist. We used to rely on rtc_static_library to break this chain. So this CL replaced some rtc_source_set with rtc_static_library. libvpx fix (https://chromium-review.googlesource.com/c/544107/) for ios-simulator linking issue is landed and this CL can be sumbitted once the new Chromium is rolled into WebRTC. BUG=chromium:734631 Review-Url: https://codereview.webrtc.org/2947273002 Cr-Commit-Position: refs/heads/master@{#18709} --- webrtc/media/BUILD.gn | 2 +- webrtc/pc/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index ec00b049b6..2919618b1a 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn @@ -50,7 +50,7 @@ rtc_source_set("rtc_h264_profile_id") { ] } -rtc_source_set("rtc_media_base") { +rtc_static_library("rtc_media_base") { # TODO(kjellander): Remove (bugs.webrtc.org/6828) # Enabling GN check triggers cyclic dependency error: # //webrtc/media:rtc_media_base -> diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn index 4719db64c0..60d76ed239 100644 --- a/webrtc/pc/BUILD.gn +++ b/webrtc/pc/BUILD.gn @@ -185,7 +185,7 @@ rtc_static_library("peerconnection") { # need should use CreateModularCreatePeerConnectionFactory instead, using the # "peerconnection" build target and other targets specific to their # requrements. See comment in peerconnectionfactoryinterface.h. -rtc_source_set("create_pc_factory") { +rtc_static_library("create_pc_factory") { sources = [ "createpeerconnectionfactory.cc", ]