gpu_messages.h => gpu/ipc/common

gpu/ipc/common/BUILD.gn

Index: gpu/ipc/common/BUILD.gn
diff --git a/gpu/ipc/common/BUILD.gn b/gpu/ipc/common/BUILD.gn
index a11052405687fcac640efde15d5fdf6440424455..e5f9aba3581c0e5a44446de40417ac7591efe5be 100644
--- a/gpu/ipc/common/BUILD.gn
+++ b/gpu/ipc/common/BUILD.gn
@@ -14,13 +14,51 @@ group("common") {
   }
 }
 
-source_set("ipc_common_sources") {
+group("command_buffer_traits") {
+  if (is_component_build) {
+    public_deps = [
+      "//gpu",
+    ]
+  } else {
+    public_deps = [
+      ":command_buffer_traits_sources",
+    ]
+  }
+}
+
+source_set("command_buffer_traits_sources") {
   visibility = [ "//gpu/*" ]
 
   sources = [
     "gpu_command_buffer_traits.cc",
     "gpu_command_buffer_traits.h",
+    "gpu_command_buffer_traits_multi.h",
     "id_type_traits.h",
+  ]
+
+  configs += [
+    "//gpu:gpu_implementation",
+    "//third_party/khronos:khronos_headers",
+  ]
+
+  deps = [
+    "//base",
+    "//gpu/command_buffer/common:common_sources",
+    "//ipc",
+  ]
+}
+
+source_set("ipc_common_sources") {
+  visibility = [ "//gpu/*" ]
+
+  sources = [
+    "gpu_message_generator.cc",
+    "gpu_message_generator.h",
+    "gpu_messages.h",
+    "gpu_param_traits.cc",
+    "gpu_param_traits.h",
+    "gpu_param_traits_macros.h",
+    "gpu_stream_constants.h",
     "memory_stats.cc",
     "memory_stats.h",
   ]
@@ -31,10 +69,15 @@ source_set("ipc_common_sources") {
   ]
 
   deps = [
+    ":command_buffer_traits_sources",
     "//base",
     "//gpu/command_buffer/common:common_sources",
+    "//gpu/config:config_sources",
     "//ipc",
-    "//ui/gfx:native_widget_types",
+    "//ui/events/ipc:events_ipc",
+    "//ui/gfx/ipc",
+    "//ui/gl",
+    "//url/ipc:url_ipc",
   ]
 
   if (is_android) {
@@ -44,7 +87,5 @@ source_set("ipc_common_sources") {
       "android/surface_texture_peer.cc",
       "android/surface_texture_peer.h",
     ]
-
-    deps += [ "//ui/gl" ]
   }
 }