Commit a9242320 authored by Dan Elphick's avatar Dan Elphick Committed by Commit Bot

[build] Fold v8_wrappers into v8_libbase

Remove most dependencies on v8_wrappers. The remainder all depend on
v8_libbase anyway, so just fold it into that target which removes a gn
check error. Also removes v8_wrappers from the fuzzers where it's not
used.

Bug: v8:7330
Change-Id: I916806b62f8c49cc1d50ef493aa900e30fc623aa
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2716383
Commit-Queue: Dan Elphick <delphick@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Auto-Submit: Dan Elphick <delphick@chromium.org>
Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73041}
parent 3c9c3015
...@@ -2155,12 +2155,6 @@ if (v8_generate_external_defines_header) { ...@@ -2155,12 +2155,6 @@ if (v8_generate_external_defines_header) {
} }
} }
v8_header_set("v8_wrappers") {
configs = [ ":internal_config" ]
sources = [ "src/base/platform/wrappers.h" ]
}
# This is split out to share basic headers with Torque and everything else:( # This is split out to share basic headers with Torque and everything else:(
v8_header_set("v8_shared_internal_headers") { v8_header_set("v8_shared_internal_headers") {
visibility = [ visibility = [
...@@ -4095,7 +4089,6 @@ v8_source_set("v8_base_without_compiler") { ...@@ -4095,7 +4089,6 @@ v8_source_set("v8_base_without_compiler") {
":v8_shared_internal_headers", ":v8_shared_internal_headers",
":v8_tracing", ":v8_tracing",
":v8_version", ":v8_version",
":v8_wrappers",
"src/inspector:inspector", "src/inspector:inspector",
] ]
...@@ -4263,10 +4256,7 @@ v8_source_set("torque_base") { ...@@ -4263,10 +4256,7 @@ v8_source_set("torque_base") {
deps = [ ":v8_shared_internal_headers" ] deps = [ ":v8_shared_internal_headers" ]
public_deps = [ public_deps = [ ":v8_libbase" ]
":v8_libbase",
":v8_wrappers",
]
# The use of exceptions for Torque in violation of the Chromium style-guide # The use of exceptions for Torque in violation of the Chromium style-guide
# is justified by the fact that it is only used from the non-essential # is justified by the fact that it is only used from the non-essential
...@@ -4389,6 +4379,7 @@ v8_component("v8_libbase") { ...@@ -4389,6 +4379,7 @@ v8_component("v8_libbase") {
"src/base/platform/semaphore.h", "src/base/platform/semaphore.h",
"src/base/platform/time.cc", "src/base/platform/time.cc",
"src/base/platform/time.h", "src/base/platform/time.h",
"src/base/platform/wrappers.h",
"src/base/region-allocator.cc", "src/base/region-allocator.cc",
"src/base/region-allocator.h", "src/base/region-allocator.h",
"src/base/ring-buffer.h", "src/base/ring-buffer.h",
...@@ -4413,8 +4404,6 @@ v8_component("v8_libbase") { ...@@ -4413,8 +4404,6 @@ v8_component("v8_libbase") {
deps = [ ":v8_headers" ] deps = [ ":v8_headers" ]
public_deps = [ ":v8_wrappers" ]
data = [] data = []
data_deps = [] data_deps = []
...@@ -4585,7 +4574,6 @@ v8_component("v8_libplatform") { ...@@ -4585,7 +4574,6 @@ v8_component("v8_libplatform") {
":v8_headers", ":v8_headers",
":v8_libbase", ":v8_libbase",
":v8_tracing", ":v8_tracing",
":v8_wrappers",
] ]
if (v8_use_perfetto) { if (v8_use_perfetto) {
...@@ -4985,7 +4973,6 @@ if (current_toolchain == v8_snapshot_toolchain) { ...@@ -4985,7 +4973,6 @@ if (current_toolchain == v8_snapshot_toolchain) {
":v8_maybe_icu", ":v8_maybe_icu",
":v8_shared_internal_headers", ":v8_shared_internal_headers",
":v8_tracing", ":v8_tracing",
":v8_wrappers",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
] ]
} }
...@@ -5353,7 +5340,6 @@ v8_executable("d8") { ...@@ -5353,7 +5340,6 @@ v8_executable("d8") {
":v8_libbase", ":v8_libbase",
":v8_libplatform", ":v8_libplatform",
":v8_tracing", ":v8_tracing",
":v8_wrappers",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
] ]
...@@ -5486,10 +5472,7 @@ v8_fuzzer("json_fuzzer") { ...@@ -5486,10 +5472,7 @@ v8_fuzzer("json_fuzzer") {
v8_source_set("multi_return_fuzzer") { v8_source_set("multi_return_fuzzer") {
sources = [ "test/fuzzer/multi-return.cc" ] sources = [ "test/fuzzer/multi-return.cc" ]
deps = [ deps = [ ":fuzzer_support" ]
":fuzzer_support",
":v8_wrappers",
]
configs = [ configs = [
":external_config", ":external_config",
...@@ -5503,10 +5486,7 @@ v8_fuzzer("multi_return_fuzzer") { ...@@ -5503,10 +5486,7 @@ v8_fuzzer("multi_return_fuzzer") {
v8_source_set("parser_fuzzer") { v8_source_set("parser_fuzzer") {
sources = [ "test/fuzzer/parser.cc" ] sources = [ "test/fuzzer/parser.cc" ]
deps = [ deps = [ ":fuzzer_support" ]
":fuzzer_support",
":v8_wrappers",
]
configs = [ configs = [
":external_config", ":external_config",
...@@ -5523,10 +5503,7 @@ v8_source_set("regexp_builtins_fuzzer") { ...@@ -5523,10 +5503,7 @@ v8_source_set("regexp_builtins_fuzzer") {
"test/fuzzer/regexp_builtins/mjsunit.js.h", "test/fuzzer/regexp_builtins/mjsunit.js.h",
] ]
deps = [ deps = [ ":fuzzer_support" ]
":fuzzer_support",
":v8_wrappers",
]
configs = [ configs = [
":external_config", ":external_config",
...@@ -5540,10 +5517,7 @@ v8_fuzzer("regexp_builtins_fuzzer") { ...@@ -5540,10 +5517,7 @@ v8_fuzzer("regexp_builtins_fuzzer") {
v8_source_set("regexp_fuzzer") { v8_source_set("regexp_fuzzer") {
sources = [ "test/fuzzer/regexp.cc" ] sources = [ "test/fuzzer/regexp.cc" ]
deps = [ deps = [ ":fuzzer_support" ]
":fuzzer_support",
":v8_wrappers",
]
configs = [ configs = [
":external_config", ":external_config",
...@@ -5584,7 +5558,6 @@ v8_source_set("wasm_fuzzer") { ...@@ -5584,7 +5558,6 @@ v8_source_set("wasm_fuzzer") {
deps = [ deps = [
":fuzzer_support", ":fuzzer_support",
":lib_wasm_fuzzer_common", ":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common", ":wasm_test_common",
] ]
...@@ -5603,7 +5576,6 @@ v8_source_set("wasm_async_fuzzer") { ...@@ -5603,7 +5576,6 @@ v8_source_set("wasm_async_fuzzer") {
deps = [ deps = [
":fuzzer_support", ":fuzzer_support",
":lib_wasm_fuzzer_common", ":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common", ":wasm_test_common",
] ]
...@@ -5625,7 +5597,6 @@ v8_source_set("wasm_code_fuzzer") { ...@@ -5625,7 +5597,6 @@ v8_source_set("wasm_code_fuzzer") {
deps = [ deps = [
":fuzzer_support", ":fuzzer_support",
":lib_wasm_fuzzer_common", ":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common", ":wasm_test_common",
] ]
...@@ -5668,7 +5639,6 @@ v8_source_set("wasm_compile_fuzzer") { ...@@ -5668,7 +5639,6 @@ v8_source_set("wasm_compile_fuzzer") {
deps = [ deps = [
":fuzzer_support", ":fuzzer_support",
":lib_wasm_fuzzer_common", ":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common", ":wasm_test_common",
] ]
...@@ -5686,7 +5656,6 @@ v8_source_set("inspector_fuzzer") { ...@@ -5686,7 +5656,6 @@ v8_source_set("inspector_fuzzer") {
deps = [ deps = [
":fuzzer_support", ":fuzzer_support",
":v8_wrappers",
"test/inspector:inspector_test", "test/inspector:inspector_test",
] ]
......
...@@ -16,10 +16,7 @@ v8_executable("cctest") { ...@@ -16,10 +16,7 @@ v8_executable("cctest") {
sources = [ "cctest.cc" ] sources = [ "cctest.cc" ]
deps = [ deps = [ ":cctest_sources" ]
":cctest_sources",
"../..:v8_wrappers",
]
data_deps = [ "../../tools:v8_testrunner" ] data_deps = [ "../../tools:v8_testrunner" ]
...@@ -441,7 +438,6 @@ v8_source_set("cctest_sources") { ...@@ -441,7 +438,6 @@ v8_source_set("cctest_sources") {
"../..:v8_for_testing", "../..:v8_for_testing",
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",
"../..:v8_wrappers",
"../..:wasm_test_common", "../..:wasm_test_common",
"../../tools/debug_helper:v8_debug_helper", "../../tools/debug_helper:v8_debug_helper",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
...@@ -516,7 +512,6 @@ v8_executable("generate-bytecode-expectations") { ...@@ -516,7 +512,6 @@ v8_executable("generate-bytecode-expectations") {
"../..:v8", "../..:v8",
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",
"../..:v8_wrappers",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
] ]
......
...@@ -23,7 +23,6 @@ v8_source_set("inspector_test") { ...@@ -23,7 +23,6 @@ v8_source_set("inspector_test") {
"../..:v8", "../..:v8",
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",
"../..:v8_wrappers",
"../../src/inspector:inspector_test_headers", "../../src/inspector:inspector_test_headers",
] ]
} }
......
...@@ -19,7 +19,6 @@ v8_executable("mkgrokdump") { ...@@ -19,7 +19,6 @@ v8_executable("mkgrokdump") {
"../..:v8", "../..:v8",
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",
"../..:v8_wrappers",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
] ]
......
...@@ -484,7 +484,6 @@ v8_source_set("unittests_sources") { ...@@ -484,7 +484,6 @@ v8_source_set("unittests_sources") {
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",
"../..:v8_shared_internal_headers", "../..:v8_shared_internal_headers",
"../..:v8_wrappers",
"../..:wasm_test_common", "../..:wasm_test_common",
"../../third_party/inspector_protocol:crdtp_test", "../../third_party/inspector_protocol:crdtp_test",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment