    deps = [
      ":v8_libbase",
      "//build/config/sanitizers:deps",
-@@ -2588,7 +2592,7 @@ group("v8_fuzzers") {
+@@ -2588,7 +2608,7 @@ group("v8_fuzzers") {
    ]
  }
  

 
 declare_args() {
   # Includes files needed for correctness fuzzing.
@@ -143,7 +144,12 @@ template("v8_executable") {
 }
 
 template("v8_component") {
-  component(target_name) {
+  if (is_component_build || target_name == "v8") {
+    v8_component = component_electron
+  } else {
+    v8_component = "source_set"
+  }
+  target(v8_component, target_name) {
     forward_variables_from(invoker, "*", [ "configs" ])
     configs += invoker.configs
     configs -= v8_remove_configs
diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
index e6742c09f7..ef3876d1d8 100644
--- a/src/inspector/BUILD.gn
+++ b/src/inspector/BUILD.gn
@@ -106,7 +106,7 @@ config("inspector_config") {

     sources = [
       "src/v8dll-main.cc",
diff --git a/gni/v8.gni b/gni/v8.gni
index ea628e0..1b521f8 100644
--- a/gni/v8.gni
+++ b/gni/v8.gni
@@ -4,6 +4,7 @@
