Skip to content

Commit

Permalink
deps: V8: cherry-pick 7c182bd65f42
Browse files Browse the repository at this point in the history
Original commit message:

    Fix visiblity rules for configs enforced by the latest GN version.

    Prior versions of GN had a bug (gn:22) where visibility rules
    for configs weren't being enforced properly.

    This CL tweaks the visibility settings of some configs to
    conform to the latest version.

    Change-Id: Ic5d827a1f2774278d3894f67fe52bfca836c0409
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2360909
    Commit-Queue: Dirk Pranke <dpranke@google.com>
    Reviewed-by: Adam Klein <adamk@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#69463}

Refs: v8/v8@7c182bd

PR-URL: #39244
Refs: nodejs/build#2696
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
targos authored and richardlau committed Jul 20, 2021
1 parent a83b01a commit 4be2e87
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.69',
'v8_embedder_string': '-node.70',

##### V8 defaults for Node.js #####

Expand Down
12 changes: 8 additions & 4 deletions deps/v8/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ v8_toolset_for_shell = "host"
#

config("internal_config_base") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
# Only targets in this file and its subdirs can depend on this.
visibility = [ "./*" ]

configs = [ ":v8_tracing_config" ]

Expand All @@ -321,7 +322,8 @@ config("internal_config_base") {

config("internal_config") {
defines = []
visibility = [ ":*" ] # Only targets in this file can depend on this.
# Only targets in this file and its subdirs can depend on this.
visibility = [ "./*" ]

configs = [
"//build/config/compiler:wexit_time_destructors",
Expand Down Expand Up @@ -429,7 +431,8 @@ config("v8_header_features") {
# Put defines here that are only used in our internal files and NEVER in
# external headers that embedders (such as chromium and node) might include.
config("features") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
# Only targets in this file and its subdirs can depend on this.
visibility = [ "./*" ]

defines = []

Expand Down Expand Up @@ -559,7 +562,8 @@ config("features") {
}

config("toolchain") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
# Only targets in this file and its subdirs can depend on this.
visibility = [ "./*" ]

defines = []
cflags = []
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/third_party/inspector_protocol/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import("../../gni/v8.gni")

config("crdtp_config") {
visibility = [ "../../src/inspector:*" ]
visibility = [ "../../src/inspector:*", ":*" ]
configs = [ "../../:internal_config" ]
include_dirs = [ "../../include" ]
}
Expand Down

0 comments on commit 4be2e87

Please sign in to comment.