admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure vp9 actually gets excluded in gn as well.

Browse Source 
It was being excluded in this manner in gyp so it should be in gn as
well.

R=charujain@webrtc.org,kjellander@webrtc.org
BUG=webrtc:6412

Review-Url: https://codereview.webrtc.org/2392053003
Cr-Commit-Position: refs/heads/master@{#14525}
This commit is contained in:
phoglund 2016-10-05 06:52:22 -07:00 committed by Commit bot
parent 3dacb5370e
commit 3360352c2b
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/BUILD.gn
View File

@ -130,6 +130,10 @@ config("common_config") {
defines += [ "EXPAT_RELATIVE_PATH" ]
}
if (!rtc_libvpx_build_vp9) {
defines += [ "RTC_DISABLE_VP9" ]
}
if (build_with_chromium) {
defines += [
# NOTICE: Since common_inherited_config is used in public_configs for our

24
webrtc/modules/video_coding/BUILD.gn
View File

@ -279,15 +279,21 @@ rtc_static_library("webrtc_vp8") {
}
rtc_static_library("webrtc_vp9") {
sources = [
"codecs/vp9/include/vp9.h",
"codecs/vp9/screenshare_layers.cc",
"codecs/vp9/screenshare_layers.h",
"codecs/vp9/vp9_frame_buffer_pool.cc",
"codecs/vp9/vp9_frame_buffer_pool.h",
"codecs/vp9/vp9_impl.cc",
"codecs/vp9/vp9_impl.h",
]
if (rtc_libvpx_build_vp9) {
sources = [
"codecs/vp9/include/vp9.h",
"codecs/vp9/screenshare_layers.cc",
"codecs/vp9/screenshare_layers.h",
"codecs/vp9/vp9_frame_buffer_pool.cc",
"codecs/vp9/vp9_frame_buffer_pool.h",
"codecs/vp9/vp9_impl.cc",
"codecs/vp9/vp9_impl.h",
]
} else {
sources = [
"codecs/vp9/vp9_noop.cc",
]
}
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.