Skip to content

Commit 2b54156

Browse files
targosrichardlau
authored andcommitted
deps: V8: cherry-pick 92e6d3317082
Original commit message: build: Remove no-op calls to set_sources_assignment_filter Chromiun no longer use set_sources_assignment_filter() anywhere in the build, so these are no longer needed. Bug: chromium:1018739 Change-Id: I7b33612d925563ebca0d93a7d3c9183d7305b7b0 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2456988 Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#70405} Refs: v8/v8@92e6d33 PR-URL: #39245 Refs: nodejs/build#2696 Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent bbceab4 commit 2b54156

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
# Reset this number to 0 on major V8 upgrades.
3636
# Increment by one for each non-official patch applied to deps/v8.
37-
'v8_embedder_string': '-node.48',
37+
'v8_embedder_string': '-node.49',
3838

3939
##### V8 defaults for Node.js #####
4040

deps/v8/testing/gtest/BUILD.gn

+4-14
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import("//build_overrides/gtest.gni")
66
if (is_ios) {
7+
import("//build/buildflag_header.gni")
78
import("//build/config/coverage/coverage.gni")
89
import("//build/config/ios/ios_sdk.gni")
9-
import("//build/buildflag_header.gni")
1010
}
1111

1212
config("gtest_direct_config") {
@@ -40,9 +40,7 @@ static_library("gtest") {
4040
# Android. https://codereview.chromium.org/2852613002/#ps20001
4141
"empty.cc",
4242
]
43-
public_deps = [
44-
"//third_party/googletest:gtest",
45-
]
43+
public_deps = [ "//third_party/googletest:gtest" ]
4644

4745
public_configs = [ ":gtest_direct_config" ]
4846

@@ -58,27 +56,21 @@ static_library("gtest") {
5856
}
5957

6058
if ((is_mac || is_ios) && gtest_include_objc_support) {
61-
if (is_ios) {
62-
set_sources_assignment_filter([])
63-
}
6459
sources += [
6560
"../gtest_mac.h",
6661
"../gtest_mac.mm",
6762
]
6863
if (gtest_include_platform_test) {
6964
sources += [ "../platform_test_mac.mm" ]
7065
}
71-
set_sources_assignment_filter(sources_assignment_filter)
7266
}
7367

7468
if (is_ios && gtest_include_ios_coverage) {
7569
sources += [
7670
"../coverage_util_ios.h",
7771
"../coverage_util_ios.mm",
7872
]
79-
deps = [
80-
":ios_enable_coverage",
81-
]
73+
deps = [ ":ios_enable_coverage" ]
8274
}
8375
}
8476

@@ -87,9 +79,7 @@ static_library("gtest") {
8779
# into //third_party/googletest.
8880
source_set("gtest_main") {
8981
testonly = true
90-
deps = [
91-
"//third_party/googletest:gtest_main",
92-
]
82+
deps = [ "//third_party/googletest:gtest_main" ]
9383
}
9484

9585
if (is_ios) {

0 commit comments

Comments
 (0)