bind-gen: Clean up the generated file list

Makes a clear separation between Direct Socket and Serial.
It's just a coincidence that both features are disabled on
the same platform.

Change-Id: Iee2a691fcfabfe00651535fecaab6595c14a300d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494610Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820676}

third_party/blink/renderer/bindings/generated_in_modules.gni

@@ -2217,7 +2217,21 @@ generated_interface_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h",
 ]
 
-# Serial and Direct Sockets
+# Direct Sockets
+if (!is_android) {
+  generated_dictionary_sources_in_modules += [
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.cc",
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.h",
+  ]
+  generated_interface_sources_in_modules += [
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.cc",
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.h",
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.cc",
+    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.h",
+  ]
+}
+
+# Serial
 if (!is_android) {
   generated_dictionary_sources_in_modules += [
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_connection_event_init.cc",
@@ -2234,8 +2248,6 @@ if (!is_android) {
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_info.h",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_request_options.cc",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port_request_options.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_socket_options.h",
   ]
   generated_enumeration_sources_in_modules += [
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_flow_control_type.cc",
@@ -2250,10 +2262,6 @@ if (!is_android) {
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_connection_event.h",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port.cc",
     "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_serial_port.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_tcp_socket.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_udp_socket.h",
   ]
 }
 

third_party/blink/renderer/bindings/idl_in_modules.gni

@@ -1020,14 +1020,22 @@ static_idl_files_in_modules = get_path_info(
         ],
         "abspath")
 
-# Serial and Direct Sockets
+# Direct Sockets
 if (!is_android) {
   static_idl_files_in_modules += get_path_info(
           [
             "//third_party/blink/renderer/modules/direct_sockets/navigator_socket.idl",
+            "//third_party/blink/renderer/modules/direct_sockets/socket_options.idl",
             "//third_party/blink/renderer/modules/direct_sockets/tcp_socket.idl",
             "//third_party/blink/renderer/modules/direct_sockets/udp_socket.idl",
-            "//third_party/blink/renderer/modules/direct_sockets/socket_options.idl",
+          ],
+          "abspath")
+}
+
+# Serial
+if (!is_android) {
+  static_idl_files_in_modules += get_path_info(
+          [
             "//third_party/blink/renderer/modules/serial/navigator_serial.idl",
             "//third_party/blink/renderer/modules/serial/serial.idl",
             "//third_party/blink/renderer/modules/serial/serial_connection_event.idl",