      deps = [
        ":v8_base",
        ":v8_builtins_setup",
-@@ -2680,7 +2700,7 @@ group("v8_fuzzers") {
+@@ -2667,7 +2697,7 @@ group("v8_fuzzers") {
    ]
  }
  

     defines = [ "USING_V8_SHARED" ]
   }
   include_dirs = [
@@ -2444,7 +2460,7 @@ v8_component("v8_libbase") {
 
   defines = []
 
-  if (is_component_build) {
+  if (is_component_build || is_electron_build) {
     defines = [ "BUILDING_V8_BASE_SHARED" ]
   }
 
@@ -2537,7 +2553,7 @@ v8_component("v8_libplatform") {
 
   configs = [ ":internal_config_base" ]
 
-  if (is_component_build) {
+  if (is_component_build || is_electron_build) {
     defines = [ "BUILDING_V8_PLATFORM_SHARED" ]
   }
 
@@ -2601,6 +2617,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
 
     configs = [ ":internal_config" ]
 

   v8_component("v8") {
     sources = [
       "src/v8dll-main.cc",
@@ -2681,6 +2711,13 @@ if (is_component_build) {
     configs = [ ":internal_config" ]
 
     public_configs = [ ":external_config" ]
+
+    # For Electron "static_library" keep V8 as a shared library. This is only
+    # needed so that other targets in Chromium build cleanly. Electron doesn't
+    # need the DLL.
+    if (is_electron_build && !is_component_build) {
+      static_component_type = "shared_library"
+    }
   }
 
   v8_component("v8_for_testing") {
diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
index e6742c0..ef3876d 100644
--- a/src/inspector/BUILD.gn
