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

Don't include x11-specific code when use_x11 is set to false.

Browse Source 
Don't include x11-specific code in test_renderer_generic when
use_x11 is set to false.

Bug: webrtc:8500
Change-Id: If64305e63484b985d90a9c9381bd391e34db3e26
Reviewed-on: https://webrtc-review.googlesource.com/21000
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20602}
This commit is contained in:
Edward Lemur 2017-11-07 19:07:31 +01:00 committed by Commit Bot
parent 8c37b618b1
commit 84a87c4575
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/BUILD.gn
View File

@ -640,9 +640,6 @@ rtc_source_set("test_renderer_generic") {
] ]
libs = [] libs = []
sources = [ sources = [
"linux/glx_renderer.cc",
"linux/glx_renderer.h",
"linux/video_renderer_linux.cc",
"video_renderer.cc", "video_renderer.cc",
"video_renderer.h", "video_renderer.h",
"win/d3d_renderer.cc", "win/d3d_renderer.cc",
@ -656,17 +653,22 @@ rtc_source_set("test_renderer_generic") {
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"//testing/gtest", "//testing/gtest",
] ]
if (!is_linux && !is_mac && !is_win) { if (!(is_linux && use_x11) && !is_mac && !is_win) {
sources += [ "null_platform_renderer.cc" ] sources += [ "null_platform_renderer.cc" ]
} }
if (is_linux || is_mac) { if ((is_linux && use_x11) || is_mac) {
sources += [ sources += [
"gl/gl_renderer.cc", "gl/gl_renderer.cc",
"gl/gl_renderer.h", "gl/gl_renderer.h",
] ]
} }
if (is_linux) { if (is_linux && use_x11) {
sources += [
"linux/glx_renderer.cc",
"linux/glx_renderer.h",
"linux/video_renderer_linux.cc",
]
libs += [ libs += [
"Xext", "Xext",
"X11", "X11",