remoting/client: Fix the cros chrome-sdk build.

The target remoting/test:ar_sample_test_driver is broken because the
//ui/gl dependency is missing (for GL headers) and the GL lib was being
added for the is_chromeos build (the cros chrome-sdk build does not have
libGL).

R=yuweih@chromium.org

Bug: 867013
Test: none
Change-Id: I409d9540ff3cb2ce6cb2c2d570e3441d1f80c7ee
Reviewed-on: https://chromium-review.googlesource.com/1150510
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Yuwei Huang <yuweih@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579929}

remoting/BUILD.gn

@@ -157,7 +157,6 @@ test("remoting_unittests") {
     "//remoting/base:unit_tests",
     "//remoting/client:unit_tests",
     "//remoting/client/audio:unit_tests",
-    "//remoting/client/display:unit_tests",
     "//remoting/client/input:unit_tests",
     "//remoting/client/ui:unit_tests",
     "//remoting/protocol:unit_tests",
@@ -192,6 +191,12 @@ test("remoting_unittests") {
       "wtsapi32.lib",
     ]
   }
+
+  if (!is_chromeos) {
+    deps += [
+      "//remoting/client/display:unit_tests",
+    ]
+  }
 }
 
 if (enable_remoting_host) {

remoting/client/BUILD.gn

@@ -57,16 +57,26 @@ static_library("client") {
       "chromoting_client_runtime.h",
       "dual_buffer_frame_consumer.cc",
       "dual_buffer_frame_consumer.h",
-      "gesture_interpreter.cc",
-      "gesture_interpreter.h",
       "oauth_token_getter_proxy.cc",
       "oauth_token_getter_proxy.h",
     ]
     deps += [
-      "//remoting/client/display",
       "//remoting/client/input",
       "//remoting/client/ui",
     ]
+
+    if (!is_chromeos) {
+      # GestureInterpreter depends on //remoting/client/display, which currently
+      # doesn't build on CrOS. crbug.com/869578
+      sources += [
+        "gesture_interpreter.cc",
+        "gesture_interpreter.h",
+      ]
+
+      deps += [
+        "//remoting/client/display",
+      ]
+    }
   }
   if (is_android) {
     libs += [ "android" ]

remoting/client/display/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# TODO(yuweih): This doesn't build on CrOS. crbug.com/869578
 source_set("display") {
   sources = [
     "canvas.h",

remoting/client/ui/BUILD.gn

@@ -12,13 +12,16 @@ source_set("ui") {
 
   deps = [
     ":ui_manipulation",
-    "//remoting/client/display",
   ]
 
   public_deps = [
     "//remoting/proto",
     "//third_party/webrtc/rtc_base:rtc_base_approved",
   ]
+
+  if (!is_chromeos) {
+    deps += [ "//remoting/client/display" ]
+  }
 }
 
 source_set("ui_manipulation") {