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

mojo/public/platform/native/BUILD.gn

Index: mojo/public/platform/native/BUILD.gn
diff --git a/mojo/public/platform/native/BUILD.gn b/mojo/public/platform/native/BUILD.gn
index 2b3f6d7de2320194bc0beaa1d168b2d982e366e1..f220cf6a9a5028db5cf2630aadc7a87c0537ea0f 100644
--- a/mojo/public/platform/native/BUILD.gn
+++ b/mojo/public/platform/native/BUILD.gn
@@ -5,7 +5,7 @@
 import("../../mojo_sdk.gni")
 import("../../mojo_application.gni")
 
-mojo_sdk_source_set("system") {
+mojo_sdk_source_set("system_thunks") {
   sources = [
     "system_thunks.c",
     "system_thunks.h",
@@ -22,7 +22,7 @@ mojo_sdk_source_set("system") {
   # source_set here, this flag change is not needed.
 }
 
-mojo_sdk_source_set("gles2") {
+mojo_sdk_source_set("gles2_thunks") {
   sources = [
     "gles2_impl_chromium_bind_uniform_location_thunks.c",
     "gles2_impl_chromium_bind_uniform_location_thunks.h",
@@ -54,19 +54,12 @@ mojo_sdk_source_set("gles2") {
     "gles2_impl_thunks.h",
   ]
 
-  defines = [ "MOJO_GLES2_IMPLEMENTATION" ]
-
-  configs = [ "../../c/gpu:gpu_configs" ]
-
   mojo_sdk_deps = [
     "mojo/public/c:environment",
     "mojo/public/c:system",
-    "mojo/public/c/gpu:GLES2",
   ]
-}
 
-mojo_sdk_source_set("gpu_thunks") {
-  sources = []
+  mojo_sdk_public_deps = [ "mojo/public/c:GLES2" ]
 }
 
 mojo_sdk_source_set("mgl_thunks") {
@@ -79,10 +72,10 @@ mojo_sdk_source_set("mgl_thunks") {
     "mgl_thunks.h",
   ]
 
-  mojo_sdk_deps = [
-    "mojo/public/c/gpu:MGL",
-    "mojo/public/c/gpu:MGL_signal_sync_point",
-    "mojo/public/c/gpu:MGL_echo",
+  mojo_sdk_public_deps = [
+    "mojo/public/c:MGL",
+    "mojo/public/c:MGL_signal_sync_point",
+    "mojo/public/c:MGL_echo",
   ]
 }
 
@@ -92,7 +85,7 @@ mojo_sdk_source_set("mgl_onscreen_thunks") {
     "mgl_onscreen_thunks.h",
   ]
 
-  mojo_sdk_deps = [ "mojo/public/c/gpu:MGL_onscreen" ]
+  mojo_sdk_public_deps = [ "mojo/public/c:MGL_onscreen" ]
 }
 
 mojo_sdk_source_set("platform_handle") {
@@ -101,10 +94,7 @@ mojo_sdk_source_set("platform_handle") {
     "platform_handle_private_thunks.h",
   ]
 
-  mojo_sdk_deps = [
-    "mojo/public/platform/native:platform_handle_api",
-    "mojo/public/c:system",
-  ]
+  mojo_sdk_public_deps = [ "mojo/public/platform/native:platform_handle_api" ]
 }
 
 # Only targets that are calling the thunks should depend upon this.
@@ -112,6 +102,7 @@ mojo_sdk_source_set("platform_handle_api") {
   sources = [
     "platform_handle_private.h",
   ]
+
   mojo_sdk_public_deps = [ "mojo/public/c:system" ]
 }