From 130ca7e783d123ed04758056b5fceb3dbbf5c1fa Mon Sep 17 00:00:00 2001 From: zhihuang Date: Wed, 21 Jun 2017 01:02:59 -0700 Subject: [PATCH] Reland of Try to fix the binary size increase issue on Chromium. (patchset #1 id:1 of https://codereview.webrtc.org/2949953003/ ) Reason for revert: Relanding the orginal CL. The breakage would be a flakey build. Original issue's description: > Revert of Try to fix the binary size increase issue on Chromium. (patchset #1 id:1 of https://codereview.webrtc.org/2945233002/ ) > > Reason for revert: > The Android 32 (more config) bot is broken. > > Original issue's description: > > Try to fix the binary size increase issue on Chromium. > > > > The target common_video used to depend on rtc_media_base which introduces > > the dependency on p2p. This probably causes the binary size increase on Win > > Chromium. Some chromium targets like src/media/gpu:gpu depends on common_video directly. > > > > BUG=chromium:734631 > > > > Review-Url: https://codereview.webrtc.org/2945233002 > > Cr-Commit-Position: refs/heads/master@{#18693} > > Committed: https://chromium.googlesource.com/external/webrtc/+/9ed16097375fb8d9b45623c58d9086d33e503760 > > TBR=kjellander@webrtc.org,deadbeef@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=chromium:734631 > > Review-Url: https://codereview.webrtc.org/2949953003 > Cr-Commit-Position: refs/heads/master@{#18694} > Committed: https://chromium.googlesource.com/external/webrtc/+/c2e208a9249452590fa282ef5aba43e480bc5794 TBR=kjellander@webrtc.org,deadbeef@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:734631 Review-Url: https://codereview.webrtc.org/2949883003 Cr-Commit-Position: refs/heads/master@{#18695} --- webrtc/common_video/BUILD.gn | 2 +- webrtc/media/BUILD.gn | 21 +++++++++++++++++++-- webrtc/pc/BUILD.gn | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index 0dda2f8832..68b4934317 100644 --- a/webrtc/common_video/BUILD.gn +++ b/webrtc/common_video/BUILD.gn @@ -59,7 +59,7 @@ rtc_static_library("common_video") { "..:webrtc_common", "../base:rtc_base", "../base:rtc_task_queue", - "../media:rtc_media_base", + "../media:rtc_h264_profile_id", "../modules:module_api", "../system_wrappers", ] diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index 249ceb89ff..ec00b049b6 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn @@ -32,6 +32,24 @@ config("rtc_media_warnings_config") { } } +rtc_source_set("rtc_h264_profile_id") { + sources = [ + "base/h264_profile_level_id.cc", + "base/h264_profile_level_id.h", + ] + + if (!build_with_chromium && is_clang) { + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + "..:webrtc_common", + "../base:rtc_base", + "../base:rtc_base_approved", + ] +} + rtc_source_set("rtc_media_base") { # TODO(kjellander): Remove (bugs.webrtc.org/6828) # Enabling GN check triggers cyclic dependency error: @@ -51,8 +69,6 @@ rtc_source_set("rtc_media_base") { "base/codec.h", "base/cryptoparams.h", "base/device.h", - "base/h264_profile_level_id.cc", - "base/h264_profile_level_id.h", "base/mediachannel.h", "base/mediaconstants.cc", "base/mediaconstants.h", @@ -96,6 +112,7 @@ rtc_source_set("rtc_media_base") { } deps += [ + ":rtc_h264_profile_id", "..:webrtc_common", "../api:libjingle_peerconnection_api", "../base:rtc_base", diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn index 2720a1e8a8..4719db64c0 100644 --- a/webrtc/pc/BUILD.gn +++ b/webrtc/pc/BUILD.gn @@ -61,6 +61,7 @@ rtc_static_library("rtc_pc_base") { "../base:rtc_base", "../base:rtc_task_queue", "../media:rtc_data", + "../media:rtc_h264_profile_id", "../media:rtc_media_base", "../p2p:rtc_p2p", ]