Move mojo/public/c/gpu/* to mojo/public/c/include.

mojo/public/c/BUILD.gn

Index: mojo/public/c/BUILD.gn
diff --git a/mojo/public/c/BUILD.gn b/mojo/public/c/BUILD.gn
index 4616fd79e64cb3567b01212509a0d90321682441..43c4470b575c72c6d7d2654454af77f5838484af 100644
--- a/mojo/public/c/BUILD.gn
+++ b/mojo/public/c/BUILD.gn
@@ -153,6 +153,113 @@ mojo_sdk_source_set("environment_perftest_helpers") {
   mojo_sdk_deps = [ "mojo/public/cpp/system" ]
 }
 
+# gpu / gpu_onscreen -----------------------------------------------------------
+
+# TODO(vtl): Rationalize this to be more like the others. Probably, we should
+# just have :GLES2, :MGL, etc. targets (and no :gpu/:gpu_onscreen).
+
+group("gpu") {
+  public_deps = [
+    ":GLES2",
+    ":MGL",
+    ":MGL_signal_sync_point",
+  ]
+
+  deps = [
+    "../platform/native:gles2_thunks",
+  ]
+  if (!is_nacl) {
+    deps += [ "../platform/native:mgl_thunks" ]
+  }
+}
+
+group("gpu_onscreen") {
+  public_deps = [
+    ":MGL_onscreen",
+    ":gpu",
+  ]
+
+  if (!is_nacl) {
+    deps = [
+      "../platform/native:mgl_onscreen_thunks",
+    ]
+  }
+}
+
+mojo_sdk_source_set("MGL") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/MGL/mgl.h",
+    "include/MGL/mgl_types.h",
+  ]
+
+  public_deps = [
+    ":system",
+  ]
+}
+
+mojo_sdk_source_set("MGL_onscreen") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/MGL/mgl_onscreen.h",
+  ]
+
+  public_deps = [
+    ":MGL",
+  ]
+}
+
+mojo_sdk_source_set("MGL_echo") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/MGL/mgl_echo.h",
+  ]
+
+  public_deps = [
+    ":MGL",
+  ]
+}
+
+mojo_sdk_source_set("MGL_signal_sync_point") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/MGL/mgl_signal_sync_point.h",
+  ]
+
+  public_deps = [
+    ":MGL",
+  ]
+}
+
+mojo_sdk_source_set("GLES2") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/GLES2/gl2.h",
+    "include/GLES2/gl2ext.h",
+    "include/GLES2/gl2extmojo.h",
+    "include/GLES2/gl2mojo_autogen.h",
+    "include/GLES2/gl2mojo_internal.h",
+    "include/GLES2/gl2platform.h",
+  ]
+
+  public_deps = [
+    ":KHR",
+  ]
+}
+
+mojo_sdk_source_set("KHR") {
+  public_configs = [ ":c_config" ]
+
+  sources = [
+    "include/KHR/khrplatform.h",
+  ]
+}
+
 # system -----------------------------------------------------------------------
 
 # Headers in include/mojo/system (to be included as <mojo/system/HEADER.h>).