  
  declare_args() {
    # Includes files needed for correctness fuzzing.
-@@ -143,7 +144,13 @@ template("v8_executable") {
+@@ -143,7 +144,12 @@ template("v8_executable") {
  }
  
  template("v8_component") {
 -  component(target_name) {
-+  if (is_electron_build && !is_component_build &&
-+      (target_name == "v8_libbase" || target_name == "v8_libplatform")) {
++  if (is_component_build || target_name == "v8") {
++    v8_component = component_electron
++  } else {
 +    v8_component = "source_set"
-+  } else {
-+    v8_component = component_electron
 +  }
 +  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 e6742c0..ef3876d 100644
+index e6742c09f7..ef3876d1d8 100644
 --- a/src/inspector/BUILD.gn
 +++ b/src/inspector/BUILD.gn
 @@ -106,7 +106,7 @@ config("inspector_config") {

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

     defines = [ "USING_V8_SHARED" ]
   }
   include_dirs = [ "include" ]
@@ -2482,6 +2482,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
 
     configs = [ ":internal_config" ]
 
