| Index: BUILD.gn
 | 
| diff --git a/BUILD.gn b/BUILD.gn
 | 
| index 6fbd405e05b8c815cf470a1d9458ff5f3e0eed7e..61094d4f188444df1538c57cace7eb9f105ff7f7 100644
 | 
| --- a/BUILD.gn
 | 
| +++ b/BUILD.gn
 | 
| @@ -809,7 +809,6 @@ source_set("v8_maybe_snapshot") {
 | 
|    } else {
 | 
|      # Ignore v8_use_external_startup_data setting if no snapshot is used.
 | 
|      public_deps = [
 | 
| -      ":v8_builtins_setup",
 | 
|        ":v8_nosnapshot",
 | 
|      ]
 | 
|    }
 | 
| @@ -823,6 +822,7 @@ v8_source_set("v8_nosnapshot") {
 | 
|      ":js2c_experimental_extras",
 | 
|      ":js2c_extras",
 | 
|      ":v8_base",
 | 
| +    ":v8_builtins_generators",
 | 
|    ]
 | 
|  
 | 
|    sources = [
 | 
| @@ -848,6 +848,7 @@ v8_source_set("v8_snapshot") {
 | 
|      ":js2c_experimental_extras",
 | 
|      ":js2c_extras",
 | 
|      ":v8_base",
 | 
| +    ":v8_builtins_generators",
 | 
|    ]
 | 
|    public_deps = [
 | 
|      # This should be public so downstream targets can declare the snapshot
 | 
| @@ -860,7 +861,6 @@ v8_source_set("v8_snapshot") {
 | 
|      "$target_gen_dir/extras-libraries.cc",
 | 
|      "$target_gen_dir/libraries.cc",
 | 
|      "$target_gen_dir/snapshot.cc",
 | 
| -    "src/setup-isolate-deserialize.cc",
 | 
|    ]
 | 
|  
 | 
|    configs = [ ":internal_config" ]
 | 
| @@ -875,6 +875,7 @@ if (v8_use_external_startup_data) {
 | 
|        ":js2c_experimental_extras",
 | 
|        ":js2c_extras",
 | 
|        ":v8_base",
 | 
| +      ":v8_builtins_generators",
 | 
|      ]
 | 
|      public_deps = [
 | 
|        ":natives_blob",
 | 
| @@ -882,7 +883,6 @@ if (v8_use_external_startup_data) {
 | 
|      ]
 | 
|  
 | 
|      sources = [
 | 
| -      "src/setup-isolate-deserialize.cc",
 | 
|        "src/snapshot/natives-external.cc",
 | 
|        "src/snapshot/snapshot-external.cc",
 | 
|      ]
 | 
| @@ -892,11 +892,7 @@ if (v8_use_external_startup_data) {
 | 
|  }
 | 
|  
 | 
|  v8_source_set("v8_builtins_generators") {
 | 
| -  visibility = [
 | 
| -    ":*",
 | 
| -    "test/cctest:*",
 | 
| -    "test/unittests:*",
 | 
| -  ]
 | 
| +  visibility = [ ":*" ]  # Only targets in this file can depend on this.
 | 
|  
 | 
|    deps = [
 | 
|      ":v8_base",
 | 
| @@ -913,7 +909,6 @@ v8_source_set("v8_builtins_generators") {
 | 
|      "src/builtins/builtins-async-generator-gen.cc",
 | 
|      "src/builtins/builtins-async-iterator-gen.cc",
 | 
|      "src/builtins/builtins-boolean-gen.cc",
 | 
| -    "src/builtins/builtins-call-gen.cc",
 | 
|      "src/builtins/builtins-constructor-gen.cc",
 | 
|      "src/builtins/builtins-constructor-gen.h",
 | 
|      "src/builtins/builtins-constructor.h",
 | 
| @@ -927,7 +922,6 @@ v8_source_set("v8_builtins_generators") {
 | 
|      "src/builtins/builtins-handler-gen.cc",
 | 
|      "src/builtins/builtins-ic-gen.cc",
 | 
|      "src/builtins/builtins-internal-gen.cc",
 | 
| -    "src/builtins/builtins-interpreter-gen.cc",
 | 
|      "src/builtins/builtins-math-gen.cc",
 | 
|      "src/builtins/builtins-number-gen.cc",
 | 
|      "src/builtins/builtins-object-gen.cc",
 | 
| @@ -941,7 +935,6 @@ v8_source_set("v8_builtins_generators") {
 | 
|      "src/builtins/builtins-typedarray-gen.cc",
 | 
|      "src/builtins/builtins-utils-gen.h",
 | 
|      "src/builtins/builtins-wasm-gen.cc",
 | 
| -    "src/builtins/setup-builtins-internal.cc",
 | 
|      "src/ic/accessor-assembler.cc",
 | 
|      "src/ic/accessor-assembler.h",
 | 
|      "src/ic/binary-op-assembler.cc",
 | 
| @@ -954,8 +947,6 @@ v8_source_set("v8_builtins_generators") {
 | 
|      "src/interpreter/interpreter-generator.h",
 | 
|      "src/interpreter/interpreter-intrinsics-generator.cc",
 | 
|      "src/interpreter/interpreter-intrinsics-generator.h",
 | 
| -    "src/interpreter/setup-interpreter-internal.cc",
 | 
| -    "src/interpreter/setup-interpreter.h",
 | 
|    ]
 | 
|  
 | 
|    if (v8_current_cpu == "x86") {
 | 
| @@ -1008,21 +999,6 @@ v8_source_set("v8_builtins_generators") {
 | 
|    configs = [ ":internal_config" ]
 | 
|  }
 | 
|  
 | 
| -v8_source_set("v8_builtins_setup") {
 | 
| -  visibility = [ ":*" ]  # Only targets in this file can depend on this.
 | 
| -
 | 
| -  deps = [
 | 
| -    ":v8_builtins_generators",
 | 
| -  ]
 | 
| -
 | 
| -  sources = [
 | 
| -    ### gcmole(all) ###
 | 
| -    "src/setup-isolate-full.cc",
 | 
| -  ]
 | 
| -
 | 
| -  configs = [ ":internal_config" ]
 | 
| -}
 | 
| -
 | 
|  # This is split out to be a non-code containing target that the Chromium browser
 | 
|  # DLL can depend upon to get only a version string.
 | 
|  v8_header_set("v8_version") {
 | 
| @@ -1866,7 +1842,6 @@ v8_source_set("v8_base") {
 | 
|      "src/runtime/runtime.h",
 | 
|      "src/safepoint-table.cc",
 | 
|      "src/safepoint-table.h",
 | 
| -    "src/setup-isolate.h",
 | 
|      "src/signature.h",
 | 
|      "src/simulator.h",
 | 
|      "src/small-pointer-list.h",
 | 
| @@ -2623,7 +2598,6 @@ if (current_toolchain == v8_snapshot_toolchain) {
 | 
|  
 | 
|      deps = [
 | 
|        ":v8_base",
 | 
| -      ":v8_builtins_setup",
 | 
|        ":v8_libbase",
 | 
|        ":v8_libplatform",
 | 
|        ":v8_nosnapshot",
 | 
| 
 |