Revert of Remove more blink modules gypi code.

third_party/WebKit/Source/modules/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/split_static_library.gni")
 import("//build/config/chromecast_build.gni")
 import("//third_party/WebKit/Source/bindings/bindings.gni")
 import("//third_party/WebKit/Source/bindings/modules/v8/generated.gni")
 import("//third_party/WebKit/Source/bindings/modules/v8/v8.gni")
 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
@@ skipping 15 matching lines @@
   defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
 
   if (is_chromecast) {
     defines += [
       "BLINK_MSLOG=VLOG(2)",
       "BLINK_SBLOG=VLOG(2)",
     ]
   }
 }
 
-make_names("module_names") {
-  in_files = [ "indexeddb/IndexedDBNames.in" ]
-  outputs = [
-    "$blink_modules_output_dir/IndexedDBNames.cpp",
-    "$blink_modules_output_dir/IndexedDBNames.h",
-  ]
-  deps = []  # Don't use default deps (otherwise it will be circular).
-}
-
 target(modules_target_type, "modules") {
   output_name = "blink_modules"
 
   if (modules_target_type == "split_static_library") {
     split_count = 5
   }
 
   visibility = []  # Allow re-assignment of list.
   visibility = [ "//third_party/WebKit/*" ]
 
-  sources = [
-    "ModulesInitializer.cpp",
-    "ModulesInitializer.h",
-  ]
-
-  # These are the files that still need to be moved to separate BUILD files.
-  sources += rebase_path(modules_files, ".", "//")
-
-  sources += generated_modules_dictionary_files
-
-  # Compile sources generated by module_names script.
-  sources += get_target_outputs(":module_names")
-
+  sources = rebase_path(modules_files, ".", "//")
   sources += bindings_modules_v8_files
   sources += rebase_path(bindings_modules_generated_aggregate_files, ".", "//")
   sources += rebase_path(bindings_modules_generated_union_type_files, ".", "//")
   sources +=
       rebase_path(bindings_modules_generated_partial_aggregate_files, ".", "//")
   sources +=
       rebase_path([ bindings_modules_generated_init_partial_interfaces_file ],
                   ".",
                   "//")
 
   configs += [
     ":modules_implementation",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
     "//third_party/WebKit/Source:config",
     "//third_party/WebKit/Source:non_test_config",
     "//third_party/WebKit/Source:inside_blink",
   ]
 
   deps = [
     ":make_modules_generated",
-    ":module_names",
     "//device/battery:mojo_bindings_blink",
     "//device/geolocation/public/interfaces:interfaces_blink",
     "//device/nfc:mojo_bindings_blink",
     "//media/mojo/interfaces:image_capture_blink",
-    "//third_party/WebKit/Source/bindings/modules:generated",
     "//third_party/WebKit/Source/core",
     "//third_party/WebKit/Source/modules/sensor",
     "//third_party/WebKit/Source/modules/serviceworkers",
     "//third_party/WebKit/Source/modules/speech",
     "//third_party/WebKit/Source/modules/srcobject",
     "//third_party/WebKit/Source/modules/storage",
     "//third_party/WebKit/Source/modules/vibration",
     "//third_party/WebKit/Source/modules/vr",
     "//third_party/WebKit/Source/modules/wake_lock",
     "//third_party/WebKit/Source/modules/webaudio",
@@ skipping 47 matching lines @@
     "//third_party/WebKit/Source:config",
     "//third_party/WebKit/Source:inside_blink",
   ]
 
   deps = [
     "//third_party/WebKit/Source/core",
     "//third_party/WebKit/Source/modules",
   ]
 }
 
+action("module_names") {
+  script = "../build/scripts/make_names.py"
+
+  module_names_in = "indexeddb/IndexedDBNames.in"
+  inputs = make_names_files + [ module_names_in ]
+
+  outputs = [
+    "$blink_modules_output_dir/IndexedDBNames.cpp",
+    "$blink_modules_output_dir/IndexedDBNames.h",
+  ]
+
+  args = [
+    rebase_path(module_names_in, root_build_dir),
+    "--output_dir",
+    rebase_path(blink_modules_output_dir, root_build_dir),
+  ]
+}
+
+# GYP version: WebKit/Source/modules/modules_generated.gyp:make_modules_generated
 group("make_modules_generated") {
   public_deps = [
     ":module_names",
     "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated",
     "//third_party/WebKit/Source/core:core_event_interfaces",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
@@ skipping 69 matching lines @@
     ":modules",
     ":modules_testing",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/core",
     "//third_party/WebKit/Source/wtf",
     "//v8",
   ]
 }