[Remoting Client] Disable OpenGL renderer on Windows

remoting/client/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 static_library("client") {
   # Disabled the source filters because there are _mac files that need to
   # be compiled on all platforms.
   set_sources_assignment_filter([])
 
   sources = [
@@ skipping 57 matching lines @@
       "server_log_entry_client.cc",
     ]
   } else {
     sources += [
       "chromoting_client_runtime.cc",
       "chromoting_client_runtime.h",
     ]
   }
 }
 
-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",
-  ]
+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",
+    ]
 
-  deps = [
-    "//remoting/proto",
-    "//third_party/libyuv",
-    "//third_party/webrtc",
-  ]
+    deps = [
+      "//remoting/proto",
+      "//third_party/libyuv",
+      "//third_party/webrtc",
+    ]
 
-  configs += [ "//third_party/khronos:khronos_headers" ]
+    configs += [ "//third_party/khronos:khronos_headers" ]
 
-  if (is_linux) {
-    libs = [ "GL" ]
-  }
+    if (is_linux) {
+      libs = [ "GL" ]
+    }
 
-  if (is_mac) {
-    libs = [ "OpenGL.framework" ]
-  }
-
-  if (is_win) {
-    deps += [ "//third_party/angle:libGLESv2" ]
+    if (is_mac) {
+      libs = [ "OpenGL.framework" ]
+    }
   }
 }
 
 static_library("test_support") {
   testonly = true
 
   sources = [
     "fake_audio_consumer.cc",
     "fake_audio_consumer.h",
   ]
@@ skipping 12 matching lines @@
   # be compiled on all platforms.
   set_sources_assignment_filter([])
   sources = [
     "audio_decode_scheduler_unittest.cc",
     "audio_player_unittest.cc",
     "chromoting_client_runtime_unittest.cc",
     "client_status_logger_unittest.cc",
     "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",
     "normalizing_input_filter_win_unittest.cc",
     "queued_task_poster_unittest.cc",
     "server_log_entry_client_unittest.cc",
     "software_video_renderer_unittest.cc",
     "touch_input_scaler_unittest.cc",
   ]
   set_sources_assignment_filter(sources_assignment_filter)
 
   configs += [
     "//remoting:version",
     "//remoting:enable_webrtc_remoting_client",
   ]
 
   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" ]
+  }
 }