diff --git a/Makefile b/Makefile
index 346f355ea7a298..6924d349513422 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ test-code-cache: with-code-cache
 out/Makefile: config.gypi common.gypi node.gyp \
   deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
   tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-  tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+  tools/v8_gypfiles/v8.gyp
 	$(PYTHON) tools/gyp_node.py -f make
 
 config.gypi: configure configure.py
diff --git a/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi b/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi
deleted file mode 100644
index 3d0a60e1395241..00000000000000
--- a/deps/v8/third_party/inspector_protocol/inspector_protocol.gypi
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 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.
-
-{
-  'variables': {
-    'inspector_protocol_files': [
-      'lib/Allocator_h.template',
-      'lib/Array_h.template',
-      'lib/CBOR_h.template',
-      'lib/CBOR_cpp.template',
-      'lib/DispatcherBase_cpp.template',
-      'lib/DispatcherBase_h.template',
-      'lib/ErrorSupport_cpp.template',
-      'lib/ErrorSupport_h.template',
-      'lib/Forward_h.template',
-      'lib/FrontendChannel_h.template',
-      'lib/Maybe_h.template',
-      'lib/Object_cpp.template',
-      'lib/Object_h.template',
-      'lib/Parser_cpp.template',
-      'lib/Parser_h.template',
-      'lib/Protocol_cpp.template',
-      'lib/ValueConversions_h.template',
-      'lib/Values_cpp.template',
-      'lib/Values_h.template',
-      'templates/Exported_h.template',
-      'templates/Imported_h.template',
-      'templates/TypeBuilder_cpp.template',
-      'templates/TypeBuilder_h.template',
-      'code_generator.py',
-    ]
-  }
-}
diff --git a/tools/v8_gypfiles/inspector.gypi b/tools/v8_gypfiles/inspector.gypi
deleted file mode 100644
index 79e582cea9e68d..00000000000000
--- a/tools/v8_gypfiles/inspector.gypi
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'includes': [
-    '../../deps/v8/third_party/inspector_protocol/inspector_protocol.gypi',
-  ],
-  'variables': {
-    'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
-    'inspector_path': '<(V8_ROOT)/src/inspector',
-    'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
-    'inspector_generated_sources': [
-      '<(inspector_generated_output_root)/src/inspector/protocol/Forward.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Console.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Console.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.h',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Schema.cpp',
-      '<(inspector_generated_output_root)/src/inspector/protocol/Schema.h',
-      '<(inspector_generated_output_root)/include/inspector/Debugger.h',
-      '<(inspector_generated_output_root)/include/inspector/Runtime.h',
-      '<(inspector_generated_output_root)/include/inspector/Schema.h',
-    ],
-
-    'inspector_all_sources': [
-      '<(V8_ROOT)/include/v8-inspector.h',
-      '<(V8_ROOT)/include/v8-inspector-protocol.h',
-      '<(V8_ROOT)/src/inspector/custom-preview.cc',
-      '<(V8_ROOT)/src/inspector/custom-preview.h',
-      '<(V8_ROOT)/src/inspector/injected-script.cc',
-      '<(V8_ROOT)/src/inspector/injected-script.h',
-      '<(V8_ROOT)/src/inspector/inspected-context.cc',
-      '<(V8_ROOT)/src/inspector/inspected-context.h',
-      '<(V8_ROOT)/src/inspector/remote-object-id.cc',
-      '<(V8_ROOT)/src/inspector/remote-object-id.h',
-      '<(V8_ROOT)/src/inspector/search-util.cc',
-      '<(V8_ROOT)/src/inspector/search-util.h',
-      '<(V8_ROOT)/src/inspector/string-16.cc',
-      '<(V8_ROOT)/src/inspector/string-16.h',
-      '<(V8_ROOT)/src/inspector/string-util.cc',
-      '<(V8_ROOT)/src/inspector/string-util.h',
-      '<(V8_ROOT)/src/inspector/test-interface.cc',
-      '<(V8_ROOT)/src/inspector/test-interface.h',
-      '<(V8_ROOT)/src/inspector/v8-console.cc',
-      '<(V8_ROOT)/src/inspector/v8-console.h',
-      '<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-console-message.cc',
-      '<(V8_ROOT)/src/inspector/v8-console-message.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
-      '<(V8_ROOT)/src/inspector/v8-debugger-script.h',
-      '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-regex.cc',
-      '<(V8_ROOT)/src/inspector/v8-regex.h',
-      '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
-      '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
-      '<(V8_ROOT)/src/inspector/v8-value-utils.cc',
-      '<(V8_ROOT)/src/inspector/v8-value-utils.h',
-      '<(V8_ROOT)/src/inspector/value-mirror.cc',
-      '<(V8_ROOT)/src/inspector/value-mirror.h',
-      '<(V8_ROOT)/src/inspector/wasm-translation.cc',
-      '<(V8_ROOT)/src/inspector/wasm-translation.h',
-    ]
-  },
-  'include_dirs': [
-    '<(inspector_generated_output_root)',
-  ],
-  'actions': [
-    {
-      'action_name': 'protocol_compatibility',
-      'inputs': [
-        '<(inspector_path)/js_protocol.pdl',
-      ],
-      'outputs': [
-        '<@(inspector_generated_output_root)/src/js_protocol.stamp',
-      ],
-      'action': [
-        'python',
-        '<(inspector_protocol_path)/check_protocol_compatibility.py',
-        '--stamp', '<@(_outputs)',
-        '<@(_inputs)',
-      ],
-      'message': 'Checking inspector protocol compatibility',
-    },
-    {
-      'action_name': 'protocol_generated_sources',
-      'inputs': [
-        '<(inspector_path)/js_protocol.pdl',
-        '<(inspector_path)/inspector_protocol_config.json',
-        '<@(inspector_protocol_files)',
-      ],
-      'outputs': [
-        '<@(inspector_generated_sources)',
-      ],
-      'process_outputs_as_sources': 1,
-      'action': [
-        'python',
-        '<(inspector_protocol_path)/code_generator.py',
-        '--jinja_dir', '<(V8_ROOT)/third_party',
-        '--output_base', '<(inspector_generated_output_root)/src/inspector',
-        '--config', '<(inspector_path)/inspector_protocol_config.json',
-      ],
-      'message': 'Generating inspector protocol sources from protocol json',
-    },
-  ],
-}
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 3ac28fc53f6046..f6d77466228a99 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -86,6 +86,7 @@
       "typed-array-subarray",
     ],
     'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
+    'torque_output_dir': '<(torque_output_root)/torque-generated',
     # Since there is no foreach in GYP we use `ForEachFormat` to unroll the following:
     # foreach(namespace, torque_namespaces) {
     #   outputs += [
@@ -93,14 +94,17 @@
     #     "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.h",
     #   ]
     # }
-    'torque_outputs': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-from-dsl-gen.cc" <@(torque_namespaces))' ],
-    'torque_outputs+': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-from-dsl-gen.h" <@(torque_namespaces))' ],
+    'torque_outputs': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_dir)/builtins-%s-from-dsl-gen.cc" <@(torque_namespaces))' ],
+    'torque_outputs+': [ '<!@pymod_do_main(ForEachFormat "<(torque_output_dir)/builtins-%s-from-dsl-gen.h" <@(torque_namespaces))' ],
     'torque_generated_pure_headers': [
-      '<(torque_output_root)/torque-generated/builtin-definitions-from-dsl.h',
-      '<(torque_output_root)/torque-generated/class-definitions-from-dsl.h',
+      '<(torque_output_dir)/builtin-definitions-from-dsl.h',
+      '<(torque_output_dir)/class-definitions-from-dsl.h',
     ],
   },
-  'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'],
+  'includes': [
+    'toolchain.gypi',
+    'features.gypi',
+  ],
   'targets': [
     {
       'target_name': 'v8',
@@ -550,7 +554,7 @@
           ],
         },
       ],
-    },  # generate_snapshot
+    }, # generate_snapshot
     {
       'target_name': 'v8_nosnapshot',
       'type': 'static_library',
@@ -588,12 +592,11 @@
       # Since this target is a static-library, but as a side effect it generates
       # header files, it needs to be a hard dependency.
       'hard_dependency': 1,
-      'includes': [ 'inspector.gypi' ],
       'dependencies': [
         'v8_libbase',
         'v8_libsampler',
         # Code generators that only need to be build for the host.
-        'torque#host',
+        'generate-code#host',
         'generate_bytecode_builtins_list#host',
       ],
       'include_dirs': [
@@ -607,8 +610,6 @@
         ],
       },
       'sources': [
-        '<(V8_ROOT)/include/v8-inspector-protocol.h',
-        '<(V8_ROOT)/include/v8-inspector.h',
         '<(V8_ROOT)/include/v8-internal.h',
         '<(V8_ROOT)/include/v8-platform.h',
         '<(V8_ROOT)/include/v8-profiler.h',
@@ -1779,7 +1780,6 @@
         '<(V8_ROOT)/src/zone/zone.h',
         '<(generate_bytecode_builtins_list_output)',
         '<@(torque_generated_pure_headers)',
-        '<@(inspector_all_sources)',
       ],
       'conditions': [
         ['want_separate_host_toolset==1', {
@@ -2137,21 +2137,6 @@
         }],
       ],
       'actions': [
-        {
-          'action_name': 'run_torque_action',
-          'inputs': [  # Order matters.
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
-            '<@(torque_files)',
-          ],
-          'outputs': [
-            '<@(torque_outputs)',
-            '<@(torque_generated_pure_headers)',
-          ],
-          'action': [
-            '<@(_inputs)',
-            '-o', '<(torque_output_root)/torque-generated'
-          ],
-        },
       ],
     }, # v8_base
     {
@@ -2732,5 +2717,171 @@
         },
       ],
     }, # generate_bytecode_builtins_list
+    {
+      'target_name': 'generate-code',
+      'type': 'none',
+      'toolsets': [ 'host' ],
+      'dependencies': [
+        # Code generators that only need to be build for the host.
+        'torque#host',
+      ],
+
+      'variables': {
+        'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
+        'v8_inspector_src_dir': '<(V8_ROOT)/src/inspector',
+        # This list comes from deps/v8/third_party/inspector_protocol/inspector_protocol.gni
+        'inspector_protocol_templates': [
+          '<(inspector_protocol_path)/lib/base_string_adapter_cc.template',
+          '<(inspector_protocol_path)/lib/base_string_adapter_h.template',
+          '<(inspector_protocol_path)/lib/Allocator_h.template',
+          '<(inspector_protocol_path)/lib/Array_h.template',
+          '<(inspector_protocol_path)/lib/CBOR_h.template',
+          '<(inspector_protocol_path)/lib/CBOR_cpp.template',
+          '<(inspector_protocol_path)/lib/DispatcherBase_cpp.template',
+          '<(inspector_protocol_path)/lib/DispatcherBase_h.template',
+          '<(inspector_protocol_path)/lib/ErrorSupport_cpp.template',
+          '<(inspector_protocol_path)/lib/ErrorSupport_h.template',
+          '<(inspector_protocol_path)/lib/Forward_h.template',
+          '<(inspector_protocol_path)/lib/FrontendChannel_h.template',
+          '<(inspector_protocol_path)/lib/Maybe_h.template',
+          '<(inspector_protocol_path)/lib/Object_cpp.template',
+          '<(inspector_protocol_path)/lib/Object_h.template',
+          '<(inspector_protocol_path)/lib/Parser_cpp.template',
+          '<(inspector_protocol_path)/lib/Parser_h.template',
+          '<(inspector_protocol_path)/lib/Protocol_cpp.template',
+          '<(inspector_protocol_path)/lib/ValueConversions_h.template',
+          '<(inspector_protocol_path)/lib/Values_cpp.template',
+          '<(inspector_protocol_path)/lib/Values_h.template',
+          '<(inspector_protocol_path)/templates/Exported_h.template',
+          '<(inspector_protocol_path)/templates/Imported_h.template',
+          '<(inspector_protocol_path)/templates/TypeBuilder_cpp.template',
+          '<(inspector_protocol_path)/templates/TypeBuilder_h.template',
+        ],
+        'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
+        'inspector_generated_output_dir': '<(inspector_generated_output_root)/src/inspector',
+        'inspector_generated_output_dir_include': '<(inspector_generated_output_root)/include/',
+        # This list comes from deps/v8/src/inspector/BUILD.gn
+        'inspector_generated_sources': [
+          '<(inspector_generated_output_dir)/protocol/Forward.h',
+          '<(inspector_generated_output_dir)/protocol/Protocol.cpp',
+          '<(inspector_generated_output_dir)/protocol/Protocol.h',
+          '<(inspector_generated_output_dir)/protocol/Console.cpp',
+          '<(inspector_generated_output_dir)/protocol/Console.h',
+          '<(inspector_generated_output_dir)/protocol/Debugger.cpp',
+          '<(inspector_generated_output_dir)/protocol/Debugger.h',
+          '<(inspector_generated_output_dir)/protocol/HeapProfiler.cpp',
+          '<(inspector_generated_output_dir)/protocol/HeapProfiler.h',
+          '<(inspector_generated_output_dir)/protocol/Profiler.cpp',
+          '<(inspector_generated_output_dir)/protocol/Profiler.h',
+          '<(inspector_generated_output_dir)/protocol/Runtime.cpp',
+          '<(inspector_generated_output_dir)/protocol/Runtime.h',
+          '<(inspector_generated_output_dir)/protocol/Schema.cpp',
+          '<(inspector_generated_output_dir)/protocol/Schema.h',
+          '<(inspector_generated_output_dir_include)/inspector/Debugger.h',
+          '<(inspector_generated_output_dir_include)/inspector/Runtime.h',
+          '<(inspector_generated_output_dir_include)/inspector/Schema.h',
+        ],
+        'inspector_all_sources': [
+          '<(V8_ROOT)/include/v8-inspector.h',
+          '<(V8_ROOT)/include/v8-inspector-protocol.h',
+          '<(V8_ROOT)/src/inspector/custom-preview.cc',
+          '<(V8_ROOT)/src/inspector/custom-preview.h',
+          '<(V8_ROOT)/src/inspector/injected-script.cc',
+          '<(V8_ROOT)/src/inspector/injected-script.h',
+          '<(V8_ROOT)/src/inspector/inspected-context.cc',
+          '<(V8_ROOT)/src/inspector/inspected-context.h',
+          '<(V8_ROOT)/src/inspector/remote-object-id.cc',
+          '<(V8_ROOT)/src/inspector/remote-object-id.h',
+          '<(V8_ROOT)/src/inspector/search-util.cc',
+          '<(V8_ROOT)/src/inspector/search-util.h',
+          '<(V8_ROOT)/src/inspector/string-16.cc',
+          '<(V8_ROOT)/src/inspector/string-16.h',
+          '<(V8_ROOT)/src/inspector/string-util.cc',
+          '<(V8_ROOT)/src/inspector/string-util.h',
+          '<(V8_ROOT)/src/inspector/test-interface.cc',
+          '<(V8_ROOT)/src/inspector/test-interface.h',
+          '<(V8_ROOT)/src/inspector/v8-console.cc',
+          '<(V8_ROOT)/src/inspector/v8-console.h',
+          '<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-console-message.cc',
+          '<(V8_ROOT)/src/inspector/v8-console-message.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
+          '<(V8_ROOT)/src/inspector/v8-debugger-script.h',
+          '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-regex.cc',
+          '<(V8_ROOT)/src/inspector/v8-regex.h',
+          '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
+          '<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
+          '<(V8_ROOT)/src/inspector/v8-value-utils.cc',
+          '<(V8_ROOT)/src/inspector/v8-value-utils.h',
+          '<(V8_ROOT)/src/inspector/value-mirror.cc',
+          '<(V8_ROOT)/src/inspector/value-mirror.h',
+          '<(V8_ROOT)/src/inspector/wasm-translation.cc',
+          '<(V8_ROOT)/src/inspector/wasm-translation.h',
+        ]
+      },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(inspector_generated_output_root)',
+        ],
+        'sources': [
+          '<@(inspector_all_sources)',
+          '<@(inspector_generated_sources)',
+        ],
+      },
+      'actions': [
+        {
+          'action_name': 'generate_inspector_protocol_code',
+          'message': 'Generating inspector protocol sources',
+          'inputs': [
+            '<(inspector_protocol_path)/code_generator.py',
+            '<(v8_inspector_src_dir)/inspector_protocol_config.json',
+            '<@(inspector_protocol_templates)',
+          ],
+          'outputs': [
+            '<@(inspector_generated_sources)',
+          ],
+          'action': [
+            'python', '<(inspector_protocol_path)/code_generator.py',
+            '--config', '<(v8_inspector_src_dir)/inspector_protocol_config.json',
+            '--jinja_dir', '<(V8_ROOT)/third_party',
+            '--output_base', '<(inspector_generated_output_dir)',
+          ],
+        },
+        {
+          'action_name': 'run_torque_action',
+          'message': 'Running torque',
+          'inputs': [
+            # Order matters, since this list is used as arguments for invoking the action
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+            '<@(torque_files)',
+          ],
+          'outputs': [
+            '<@(torque_outputs)',
+            '<@(torque_generated_pure_headers)',
+          ],
+          'action': [
+            '<@(_inputs)',
+            '-o', '<(torque_output_dir)',
+          ],
+        },
+      ],
+    }, # generate-code
   ],
 }