Adding drawable to CRD andorid and iOS gl rendering pipeline.

remoting/client/display/BUILD.gn

Index: remoting/client/display/BUILD.gn
diff --git a/remoting/client/display/BUILD.gn b/remoting/client/display/BUILD.gn
index 102850bd1f3c8ef3d29feabe12125d53ff0784af..a57c7e60694a02fc8e326fd5d99d01850faf7dc6 100644
--- a/remoting/client/display/BUILD.gn
+++ b/remoting/client/display/BUILD.gn
@@ -4,6 +4,8 @@
 
 source_set("display") {
   sources = [
+    "canvas.h",
+    "drawable.h",
     "gl_canvas.cc",
     "gl_canvas.h",
     "gl_cursor.cc",
@@ -22,6 +24,7 @@ source_set("display") {
     "gl_render_layer.h",
     "gl_renderer.cc",
     "gl_renderer.h",
+    "sys_opengl.h",
   ]
 
   deps = [
@@ -30,7 +33,14 @@ source_set("display") {
     "//third_party/webrtc/base:rtc_base",
   ]
 
-  configs += [ "//third_party/khronos:khronos_headers" ]
+  public_configs = [ "//third_party/khronos:khronos_headers" ]
+
+  if (is_android) {
+    libs = [
+      "GLESv2",
+      "OpenSLES",

[Yuwei, 2017/01/10 19:36:10]

OpenSLES shouldn't be included here. It's for Android audio.

[nicholss, 2017/01/10 21:43:10]

Done.

+    ]
+  }
 
   if (is_linux) {
     libs = [ "GL" ]
@@ -52,30 +62,31 @@ source_set("display") {
   }
 }
 
-source_set("unit_tests") {
-  testonly = true
-
-  sources = [
-    "gl_renderer_unittest.cc",
-  ]
+if (is_win) {
+  group("unit_tests") {

[Yuwei, 2017/01/10 19:36:10]

Please add the comment about the ANGLE GLESv2 issue back here.

[nicholss, 2017/01/10 21:43:10]

Done.

+    deps = []
+  }
+} else {
+  source_set("unit_tests") {
+    testonly = true
 
-  configs += [
-    "//remoting/build/config:version",
-    "//remoting/build/config:enable_webrtc_remoting_client",
-  ]
+    sources = [
+      "fake_canvas.cc",
+      "fake_canvas.h",
+      "gl_renderer_unittest.cc",
+    ]
 
-  deps = [
-    ":display",
-    "//remoting/proto",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//third_party/webrtc/base:rtc_base",
-  ]
+    configs += [
+      "//remoting/build/config:version",
+      "//remoting/build/config:enable_webrtc_remoting_client",
+    ]
 
-  if (is_win) {
-    # Windows clang builder fails to link the test binary with ANGLE GLESv2.
-    # crbug.com/642027
-    sources -= [ "gl_renderer_unittest.cc" ]
-    deps -= [ ":display" ]
+    deps = [
+      ":display",
+      "//remoting/proto",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/webrtc/base:rtc_base",
+    ]
   }
 }