diff options
| author | Michaël Zasso <targos@protonmail.com> | 2021-07-03 12:57:22 +0300 |
|---|---|---|
| committer | Richard Lau <rlau@redhat.com> | 2021-07-20 14:11:13 +0300 |
| commit | a83b01a4afd8af7ae912a69ce37a4de0f62ff3e6 (patch) | |
| tree | 9479f684c6fe6ced52c266e61245b010e1325f68 /deps | |
| parent | 17eb5611844cda29218291bafe3ac94567a2710f (diff) | |
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: https://github.com/v8/v8/commit/92e6d3317082e492ff11fd50a1f3481368f6cafc
PR-URL: https://github.com/nodejs/node/pull/39244
Refs: https://github.com/nodejs/build/issues/2696
Reviewed-By: Richard Lau <rlau@redhat.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/testing/gtest/BUILD.gn | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/deps/v8/testing/gtest/BUILD.gn b/deps/v8/testing/gtest/BUILD.gn index fe7ba6d4839..6636b2d9acf 100644 --- a/deps/v8/testing/gtest/BUILD.gn +++ b/deps/v8/testing/gtest/BUILD.gn @@ -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") { @@ -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" ] @@ -58,9 +56,6 @@ 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", @@ -68,7 +63,6 @@ static_library("gtest") { if (gtest_include_platform_test) { sources += [ "../platform_test_mac.mm" ] } - set_sources_assignment_filter(sources_assignment_filter) } if (is_ios && gtest_include_ios_coverage) { @@ -76,9 +70,7 @@ static_library("gtest") { "../coverage_util_ios.h", "../coverage_util_ios.mm", ] - deps = [ - ":ios_enable_coverage", - ] + deps = [ ":ios_enable_coverage" ] } } @@ -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) { |