From 84a87c4575d1d0236e15188081af4417449120d8 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Tue, 7 Nov 2017 19:07:31 +0100 Subject: [PATCH] Don't include x11-specific code when use_x11 is set to false. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Edward Lemur Cr-Commit-Position: refs/heads/master@{#20602} --- test/BUILD.gn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 7277e6bab3..e00bbef145 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -640,9 +640,6 @@ rtc_source_set("test_renderer_generic") { ] libs = [] sources = [ - "linux/glx_renderer.cc", - "linux/glx_renderer.h", - "linux/video_renderer_linux.cc", "video_renderer.cc", "video_renderer.h", "win/d3d_renderer.cc", @@ -656,17 +653,22 @@ rtc_source_set("test_renderer_generic") { "../rtc_base:rtc_base_approved", "//testing/gtest", ] - if (!is_linux && !is_mac && !is_win) { + if (!(is_linux && use_x11) && !is_mac && !is_win) { sources += [ "null_platform_renderer.cc" ] } - if (is_linux || is_mac) { + if ((is_linux && use_x11) || is_mac) { sources += [ "gl/gl_renderer.cc", "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 += [ "Xext", "X11",