[Remoting Client] Disable OpenGL renderer on Windows

remoting/client/BUILD.gn

Index: remoting/client/BUILD.gn
diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn
index 22bf5af3d12265deafce20fb87bc05b87ceeb81d..2909d60673d450f69796939906a9c8bd0fcc13d4 100644
--- a/remoting/client/BUILD.gn
+++ b/remoting/client/BUILD.gn
@@ -75,46 +75,44 @@ static_library("client") {
   }
 }
 
-source_set("opengl_renderer") {
-  sources = [
-    "gl_canvas.cc",
-    "gl_canvas.h",
-    "gl_cursor.cc",
-    "gl_cursor.h",
-    "gl_cursor_feedback.cc",
-    "gl_cursor_feedback.h",
-    "gl_cursor_feedback_texture.cc",
-    "gl_cursor_feedback_texture.h",
-    "gl_desktop.cc",
-    "gl_desktop.h",
-    "gl_helpers.cc",
-    "gl_helpers.h",
-    "gl_math.cc",
-    "gl_math.h",
-    "gl_render_layer.cc",
-    "gl_render_layer.h",
-    "gl_renderer.cc",
-    "gl_renderer.h",
-  ]
-
-  deps = [
-    "//remoting/proto",
-    "//third_party/libyuv",
-    "//third_party/webrtc",
-  ]
+if (!is_win) {

[Sergey Ulanov, 2016/09/08 19:57:31]

I don't think you really want to disable this source set. Just remove it from
remoting_unittests?

[Yuwei, 2016/09/08 20:35:31]

Done.

+  source_set("opengl_renderer") {
+    sources = [
+      "gl_canvas.cc",
+      "gl_canvas.h",
+      "gl_cursor.cc",
+      "gl_cursor.h",
+      "gl_cursor_feedback.cc",
+      "gl_cursor_feedback.h",
+      "gl_cursor_feedback_texture.cc",
+      "gl_cursor_feedback_texture.h",
+      "gl_desktop.cc",
+      "gl_desktop.h",
+      "gl_helpers.cc",
+      "gl_helpers.h",
+      "gl_math.cc",
+      "gl_math.h",
+      "gl_render_layer.cc",
+      "gl_render_layer.h",
+      "gl_renderer.cc",
+      "gl_renderer.h",
+    ]
 
-  configs += [ "//third_party/khronos:khronos_headers" ]
+    deps = [
+      "//remoting/proto",
+      "//third_party/libyuv",
+      "//third_party/webrtc",
+    ]
 
-  if (is_linux) {
-    libs = [ "GL" ]
-  }
+    configs += [ "//third_party/khronos:khronos_headers" ]
 
-  if (is_mac) {
-    libs = [ "OpenGL.framework" ]
-  }
+    if (is_linux) {
+      libs = [ "GL" ]
+    }
 
-  if (is_win) {
-    deps += [ "//third_party/angle:libGLESv2" ]
+    if (is_mac) {
+      libs = [ "OpenGL.framework" ]
+    }
   }
 }
 
@@ -147,7 +145,6 @@ source_set("unit_tests") {
     "client_telemetry_logger_unittest.cc",
     "dual_buffer_frame_consumer_unittest.cc",
     "empty_cursor_filter_unittest.cc",
-    "gl_renderer_unittest.cc",
     "key_event_mapper_unittest.cc",
     "normalizing_input_filter_cros_unittest.cc",
     "normalizing_input_filter_mac_unittest.cc",
@@ -166,11 +163,15 @@ source_set("unit_tests") {
 
   deps = [
     ":client",
-    ":opengl_renderer",
     ":test_support",
     "//remoting/proto",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/webrtc",
   ]
+
+  if (!is_win) {

[Sergey Ulanov, 2016/09/08 19:57:31]

Add a comment with a bug reference to make it clear why the test is disabled.

[Yuwei, 2016/09/08 20:35:31]

Done.

+    sources += [ "gl_renderer_unittest.cc" ]
+    deps += [ ":opengl_renderer" ]
+  }
 }