commit 84a87c4575d1d0236e15188081af4417449120d8
author Edward Lemur <ehmaldonado@webrtc.org> Tue Nov 07 19:07:31 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Nov 08 21:37:48 2017 +0000
tree 9aad1446b0148197c9de43e1635321767b13640f
parent 8c37b618b162c01ee8806fbf845dbcb3d6b11e8f

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

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}

test/BUILD.gn

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 7277e6b..e00bbef 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -640,9 +640,6 @@
   ]
   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_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",