Skip to content

Commit

Permalink
deps: V8: cherry-pick 92e6d3317082
Browse files Browse the repository at this point in the history
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: #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 17eb561 commit a83b01a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 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.68',
'v8_embedder_string': '-node.69',

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

Expand Down
18 changes: 4 additions & 14 deletions deps/v8/testing/gtest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import("//build_overrides/gtest.gni")
if (is_ios) {
import("//build/buildflag_header.gni")
import("//build/config/coverage/coverage.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/buildflag_header.gni")
}

config("gtest_direct_config") {
Expand Down Expand Up @@ -40,9 +40,7 @@ static_library("gtest") {
# Android. https://codereview.chromium.org/2852613002/#ps20001
"empty.cc",
]
public_deps = [
"//third_party/googletest:gtest",
]
public_deps = [ "//third_party/googletest:gtest" ]

public_configs = [ ":gtest_direct_config" ]

Expand All @@ -58,27 +56,21 @@ static_library("gtest") {
}

if ((is_mac || is_ios) && gtest_include_objc_support) {
if (is_ios) {
set_sources_assignment_filter([])
}
sources += [
"../gtest_mac.h",
"../gtest_mac.mm",
]
if (gtest_include_platform_test) {
sources += [ "../platform_test_mac.mm" ]
}
set_sources_assignment_filter(sources_assignment_filter)
}

if (is_ios && gtest_include_ios_coverage) {
sources += [
"../coverage_util_ios.h",
"../coverage_util_ios.mm",
]
deps = [
":ios_enable_coverage",
]
deps = [ ":ios_enable_coverage" ]
}
}

Expand All @@ -87,9 +79,7 @@ static_library("gtest") {
# into //third_party/googletest.
source_set("gtest_main") {
testonly = true
deps = [
"//third_party/googletest:gtest_main",
]
deps = [ "//third_party/googletest:gtest_main" ]
}

if (is_ios) {
Expand Down

0 comments on commit a83b01a

Please sign in to comment.