Version 5.5.228.1 (cherry-pick)

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 141c799a3a71bfc70a2442ad557c7f98cd1570ce..157617372ebc99039f8166fa7503fde4d6766f9c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -115,7 +115,10 @@ config("internal_config") {
   include_dirs = [ "." ]
 
   if (is_component_build) {
-    defines = [ "BUILDING_V8_SHARED" ]
+    defines = [
+      "V8_SHARED",
+      "BUILDING_V8_SHARED",
+    ]
   }
 }
 
@@ -139,7 +142,10 @@ config("libsampler_config") {
 # itself.
 config("external_config") {
   if (is_component_build) {
-    defines = [ "USING_V8_SHARED" ]
+    defines = [
+      "V8_SHARED",
+      "USING_V8_SHARED",
+    ]
   }
   include_dirs = [ "include" ]
   if (v8_enable_inspector_override) {
@@ -2383,7 +2389,6 @@ if (is_component_build) {
 
 v8_executable("d8") {
   sources = [
-    "$target_gen_dir/d8-js.cc",
     "src/d8.cc",
     "src/d8.h",
   ]
@@ -2411,6 +2416,9 @@ v8_executable("d8") {
     sources += [ "src/d8-windows.cc" ]
   }
 
+  if (!is_component_build) {
+    sources += [ "$target_gen_dir/d8-js.cc" ]
+  }
   if (v8_enable_i18n_support) {
     deps += [ "//third_party/icu" ]
   }