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

[build] Remove the separate v8_libsampler build target

v8_libsampler was previously split off to serve goals that were never
achieved and seem unlikely to be. Since the division creates a
dependency cycle between v8_base_without_compiler and v8_libsampler
(where one edge is a #include that breaks gn check), this moves
sampler.* back into v8_base_without_compiler and removes the
v8_libsampler target.

Bug: v8:7330
Change-Id: Ied87b68927a372ec084cd650b278af98d7db5f8e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2727818
Auto-Submit: Dan Elphick <delphick@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Reviewed-by: 's avatarCamillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73108}
parent d9f3d429
......@@ -489,11 +489,6 @@ config("cppgc_base_config") {
}
}
# This config should be applied to code using the libsampler.
config("libsampler_config") {
include_dirs = [ "include" ]
}
# This config is only applied to v8_headers and is the basis for external_config
# but without setting the USING_V8_SHARED define, which means v8_headers can be
# used inside v8 itself.
......@@ -2607,6 +2602,7 @@ v8_header_set("v8_internal_headers") {
"src/interpreter/interpreter.h",
"src/json/json-parser.h",
"src/json/json-stringifier.h",
"src/libsampler/sampler.h",
"src/logging/code-events.h",
"src/logging/counters-definitions.h",
"src/logging/counters-inl.h",
......@@ -3671,6 +3667,7 @@ v8_source_set("v8_base_without_compiler") {
"src/interpreter/interpreter.cc",
"src/json/json-parser.cc",
"src/json/json-stringifier.cc",
"src/libsampler/sampler.cc",
"src/logging/counters.cc",
"src/logging/local-logger.cc",
"src/logging/log-utils.cc",
......@@ -4173,7 +4170,6 @@ v8_source_set("v8_base_without_compiler") {
":v8_cppgc_shared",
":v8_headers",
":v8_libbase",
":v8_libsampler",
":v8_shared_internal_headers",
":v8_tracing",
":v8_version",
......@@ -4665,19 +4661,6 @@ v8_component("v8_libplatform") {
}
}
v8_source_set("v8_libsampler") {
sources = [
"src/libsampler/sampler.cc",
"src/libsampler/sampler.h",
]
configs = [ ":internal_config" ]
public_configs = [ ":libsampler_config" ]
deps = [ ":v8_libbase" ]
}
v8_source_set("fuzzer_support") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
......@@ -4934,7 +4917,6 @@ if (v8_monolithic) {
":v8",
":v8_libbase",
":v8_libplatform",
":v8_libsampler",
"//build/win:default_exe_manifest",
]
......@@ -4947,7 +4929,6 @@ v8_static_library("wee8") {
":v8_base",
":v8_libbase",
":v8_libplatform",
":v8_libsampler",
":v8_shared_internal_headers",
":v8_snapshot",
"//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