Link blink mojom bindings into platform target

third_party/WebKit/Source/platform/BUILD.gn

Index: third_party/WebKit/Source/platform/BUILD.gn
diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
index 92e9fcdd63f903de65c52004f478cb70015fd41c..e8fd170150001fe85508db624d701053deed72df 100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
 import("//third_party/WebKit/Source/config.gni")
@@ -309,6 +310,64 @@ group("make_platform_generated") {
   ]
 }
 
+# This target is in Source/platform instead of public/platform so that platform
+# below has access to its target outputs.
+mojom("mojo_bindings") {
+  visibility = []  # Allow re-assignment of list.
+  visibility = [ "*" ]
+  sources = [
+    "../../public/platform/mime_registry.mojom",
+    "../../public/platform/modules/background_sync/background_sync.mojom",
+    "../../public/platform/modules/bluetooth/web_bluetooth.mojom",
+    "../../public/platform/modules/broadcastchannel/broadcast_channel.mojom",
+    "../../public/platform/modules/hyphenation/hyphenation.mojom",
+    "../../public/platform/modules/notifications/notification.mojom",
+    "../../public/platform/modules/notifications/notification_service.mojom",
+    "../../public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom",
+    "../../public/platform/modules/permissions/permission.mojom",
+    "../../public/platform/modules/permissions/permission_status.mojom",
+    "../../public/platform/modules/serviceworker/service_worker_event_status.mojom",
+    "../../public/platform/modules/wake_lock/wake_lock_service.mojom",
+  ]
+  public_deps = [
+    ":android_mojo_bindings",
+    ":new_wrapper_types_mojo_bindings",
+    "//cc/ipc:interfaces_surfaceid_only",
+    "//device/bluetooth/public/interfaces:bluetooth_mojom_bluetooth_uuid",
+    "//url/mojo:url_mojom_origin",
+  ]
+
+  use_new_wrapper_types = false
+}
+
+# GYP version: WebKit/public/blink.gyp:new_wrapper_types_mojo_bindings
+mojom("new_wrapper_types_mojo_bindings") {
+  sources = [
+    "../../public/platform/modules/presentation/presentation.mojom",
+  ]
+}
+
+# GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
+mojom("android_mojo_bindings") {
+  sources = [
+    "../../public/platform/modules/payments/payment_request.mojom",
+    "../../public/platform/modules/webshare/webshare.mojom",
+  ]
+
+  use_new_wrapper_types = false
+}
+
+group("generate_mojo_bindings") {
+  visibility = []  # Allow re-assignment of list.
+  visibility = [
+    ":*",
+    "//third_party/WebKit/public:blink_headers",
+  ]
+  deps = [
+    ":mojo_bindings_blink__generator",
+  ]
+}
+
 # TODO(brettw) Objective C Renaming postbuild steps on Mac.
 # blink_platform target in blink_platform.gyp
 component("platform") {
@@ -376,7 +435,6 @@ component("platform") {
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:wtf_support",
     "//third_party/WebKit/Source/platform/heap",
-    "//third_party/WebKit/public:mojo_bindings_blink",
     "//third_party/ced",
     "//third_party/harfbuzz-ng",
     "//third_party/icu",
@@ -384,6 +442,25 @@ component("platform") {
     "//ui/gfx/geometry",
   ]
 
+  if (is_component_build) {
+    # Compile the Blink variant of Blink's mojoms directly as part of this
+    # component instead of using a source_set to avoid circular dependencies.
+    sources +=
+        get_target_outputs(":mojo_bindings_blink__generator") +
+        get_target_outputs(":new_wrapper_types_mojo_bindings_blink__generator")
+    deps += [
+      ":mojo_bindings_blink__generator",
+      ":new_wrapper_types_mojo_bindings_blink__generator",
+
+      # Dependencies of mojo_bindings_blink__generator.
+      "//cc/ipc:interfaces_surfaceid_only_blink",
+      "//device/bluetooth/public/interfaces:bluetooth_mojom_bluetooth_uuid_blink",
+      "//url/mojo:url_mojom_origin_blink",
+    ]
+  } else {
+    deps += [ ":mojo_bindings_blink" ]
+  }
+
   if (is_mac) {
     sources -= [
       # Uses KillRingMac.mm instead.