AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

build: Remove no-op calls to set_sources_assignment_filter

Browse Source 
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}
This commit is contained in:
Sylvain Defresne 2020-10-08 10:56:25 +02:00 committed by Commit Bot
parent 5bf16197ec
commit 92e6d33170
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
testing/gtest/BUILD.gn
View File

@ -4,9 +4,9 @@
import("//build_overrides/gtest.gni") import("//build_overrides/gtest.gni")
if (is_ios) { if (is_ios) {
import("//build/buildflag_header.gni")
import("//build/config/coverage/coverage.gni") import("//build/config/coverage/coverage.gni")
import("//build/config/ios/ios_sdk.gni") import("//build/config/ios/ios_sdk.gni")
import("//build/buildflag_header.gni")
} }
config("gtest_direct_config") { config("gtest_direct_config") {
@ -40,9 +40,7 @@ static_library("gtest") {
# Android. https://codereview.chromium.org/2852613002/#ps20001 # Android. https://codereview.chromium.org/2852613002/#ps20001
"empty.cc", "empty.cc",
] ]
public_deps = [ public_deps = [ "//third_party/googletest:gtest" ]
"//third_party/googletest:gtest",
]
public_configs = [ ":gtest_direct_config" ] public_configs = [ ":gtest_direct_config" ]
@ -58,9 +56,6 @@ static_library("gtest") {
} }
if ((is_mac || is_ios) && gtest_include_objc_support) { if ((is_mac || is_ios) && gtest_include_objc_support) {
if (is_ios) {
set_sources_assignment_filter([])
}
sources += [ sources += [
"../gtest_mac.h", "../gtest_mac.h",
"../gtest_mac.mm", "../gtest_mac.mm",
@ -68,7 +63,6 @@ static_library("gtest") {
if (gtest_include_platform_test) { if (gtest_include_platform_test) {
sources += [ "../platform_test_mac.mm" ] sources += [ "../platform_test_mac.mm" ]
} }
set_sources_assignment_filter(sources_assignment_filter)
} }
if (is_ios && gtest_include_ios_coverage) { if (is_ios && gtest_include_ios_coverage) {
@ -76,9 +70,7 @@ static_library("gtest") {
"../coverage_util_ios.h", "../coverage_util_ios.h",
"../coverage_util_ios.mm", "../coverage_util_ios.mm",
] ]
deps = [ deps = [ ":ios_enable_coverage" ]
":ios_enable_coverage",
]
} }
} }
@ -87,9 +79,7 @@ static_library("gtest") {
# into //third_party/googletest. # into //third_party/googletest.
source_set("gtest_main") { source_set("gtest_main") {
testonly = true testonly = true
deps = [ deps = [ "//third_party/googletest:gtest_main" ]
"//third_party/googletest:gtest_main",
]
} }
if (is_ios) { if (is_ios) {