Skip to content

Commit

Permalink
[build] Fold v8_wrappers into v8_libbase
Browse files Browse the repository at this point in the history
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 <[email protected]>
Commit-Queue: Ulan Degenbaev <[email protected]>
Auto-Submit: Dan Elphick <[email protected]>
Reviewed-by: Ulan Degenbaev <[email protected]>
Cr-Commit-Position: refs/heads/master@{#73041}
  • Loading branch information
danelphick authored and Commit Bot committed Feb 25, 2021
1 parent 3c9c301 commit a924232
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 46 deletions.
43 changes: 6 additions & 37 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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:(
v8_header_set("v8_shared_internal_headers") {
visibility = [
Expand Down Expand Up @@ -4095,7 +4089,6 @@ v8_source_set("v8_base_without_compiler") {
":v8_shared_internal_headers",
":v8_tracing",
":v8_version",
":v8_wrappers",
"src/inspector:inspector",
]

Expand Down Expand Up @@ -4263,10 +4256,7 @@ v8_source_set("torque_base") {

deps = [ ":v8_shared_internal_headers" ]

public_deps = [
":v8_libbase",
":v8_wrappers",
]
public_deps = [ ":v8_libbase" ]

# 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
Expand Down Expand Up @@ -4389,6 +4379,7 @@ v8_component("v8_libbase") {
"src/base/platform/semaphore.h",
"src/base/platform/time.cc",
"src/base/platform/time.h",
"src/base/platform/wrappers.h",
"src/base/region-allocator.cc",
"src/base/region-allocator.h",
"src/base/ring-buffer.h",
Expand All @@ -4413,8 +4404,6 @@ v8_component("v8_libbase") {

deps = [ ":v8_headers" ]

public_deps = [ ":v8_wrappers" ]

data = []

data_deps = []
Expand Down Expand Up @@ -4585,7 +4574,6 @@ v8_component("v8_libplatform") {
":v8_headers",
":v8_libbase",
":v8_tracing",
":v8_wrappers",
]

if (v8_use_perfetto) {
Expand Down Expand Up @@ -4985,7 +4973,6 @@ if (current_toolchain == v8_snapshot_toolchain) {
":v8_maybe_icu",
":v8_shared_internal_headers",
":v8_tracing",
":v8_wrappers",
"//build/win:default_exe_manifest",
]
}
Expand Down Expand Up @@ -5353,7 +5340,6 @@ v8_executable("d8") {
":v8_libbase",
":v8_libplatform",
":v8_tracing",
":v8_wrappers",
"//build/win:default_exe_manifest",
]

Expand Down Expand Up @@ -5486,10 +5472,7 @@ v8_fuzzer("json_fuzzer") {
v8_source_set("multi_return_fuzzer") {
sources = [ "test/fuzzer/multi-return.cc" ]

deps = [
":fuzzer_support",
":v8_wrappers",
]
deps = [ ":fuzzer_support" ]

configs = [
":external_config",
Expand All @@ -5503,10 +5486,7 @@ v8_fuzzer("multi_return_fuzzer") {
v8_source_set("parser_fuzzer") {
sources = [ "test/fuzzer/parser.cc" ]

deps = [
":fuzzer_support",
":v8_wrappers",
]
deps = [ ":fuzzer_support" ]

configs = [
":external_config",
Expand All @@ -5523,10 +5503,7 @@ v8_source_set("regexp_builtins_fuzzer") {
"test/fuzzer/regexp_builtins/mjsunit.js.h",
]

deps = [
":fuzzer_support",
":v8_wrappers",
]
deps = [ ":fuzzer_support" ]

configs = [
":external_config",
Expand All @@ -5540,10 +5517,7 @@ v8_fuzzer("regexp_builtins_fuzzer") {
v8_source_set("regexp_fuzzer") {
sources = [ "test/fuzzer/regexp.cc" ]

deps = [
":fuzzer_support",
":v8_wrappers",
]
deps = [ ":fuzzer_support" ]

configs = [
":external_config",
Expand Down Expand Up @@ -5584,7 +5558,6 @@ v8_source_set("wasm_fuzzer") {
deps = [
":fuzzer_support",
":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common",
]

Expand All @@ -5603,7 +5576,6 @@ v8_source_set("wasm_async_fuzzer") {
deps = [
":fuzzer_support",
":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common",
]

Expand All @@ -5625,7 +5597,6 @@ v8_source_set("wasm_code_fuzzer") {
deps = [
":fuzzer_support",
":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common",
]

Expand Down Expand Up @@ -5668,7 +5639,6 @@ v8_source_set("wasm_compile_fuzzer") {
deps = [
":fuzzer_support",
":lib_wasm_fuzzer_common",
":v8_wrappers",
":wasm_test_common",
]

Expand All @@ -5686,7 +5656,6 @@ v8_source_set("inspector_fuzzer") {

deps = [
":fuzzer_support",
":v8_wrappers",
"test/inspector:inspector_test",
]

Expand Down
7 changes: 1 addition & 6 deletions test/cctest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ v8_executable("cctest") {

sources = [ "cctest.cc" ]

deps = [
":cctest_sources",
"../..:v8_wrappers",
]
deps = [ ":cctest_sources" ]

data_deps = [ "../../tools:v8_testrunner" ]

Expand Down Expand Up @@ -441,7 +438,6 @@ v8_source_set("cctest_sources") {
"../..:v8_for_testing",
"../..:v8_libbase",
"../..:v8_libplatform",
"../..:v8_wrappers",
"../..:wasm_test_common",
"../../tools/debug_helper:v8_debug_helper",
"//build/win:default_exe_manifest",
Expand Down Expand Up @@ -516,7 +512,6 @@ v8_executable("generate-bytecode-expectations") {
"../..:v8",
"../..:v8_libbase",
"../..:v8_libplatform",
"../..:v8_wrappers",
"//build/win:default_exe_manifest",
]

Expand Down
1 change: 0 additions & 1 deletion test/inspector/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ v8_source_set("inspector_test") {
"../..:v8",
"../..:v8_libbase",
"../..:v8_libplatform",
"../..:v8_wrappers",
"../../src/inspector:inspector_test_headers",
]
}
Expand Down
1 change: 0 additions & 1 deletion test/mkgrokdump/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ v8_executable("mkgrokdump") {
"../..:v8",
"../..:v8_libbase",
"../..:v8_libplatform",
"../..:v8_wrappers",
"//build/win:default_exe_manifest",
]

Expand Down
1 change: 0 additions & 1 deletion test/unittests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,6 @@ v8_source_set("unittests_sources") {
"../..:v8_libbase",
"../..:v8_libplatform",
"../..:v8_shared_internal_headers",
"../..:v8_wrappers",
"../..:wasm_test_common",
"../../third_party/inspector_protocol:crdtp_test",
"//build/win:default_exe_manifest",
Expand Down

0 comments on commit a924232

Please sign in to comment.