zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of Try to fix the binary size increase issue on Chromium. (patchset #1 id:1 of https://codereview.webrtc.org/2949953003/ )

Browse Source 
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: 9ed1609737
>
> 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: c2e208a924

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}
This commit is contained in:
zhihuang
2017-06-21 01:02:59 -07:00
committed by Commit Bot
parent c2e208a924
commit 130ca7e783
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_video/BUILD.gn
View File

@ -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",
]

21
webrtc/media/BUILD.gn
View File

@ -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",

1
webrtc/pc/BUILD.gn
View File

@ -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",
]