build/secondary/testing/gtest/BUILD.gn - Issue 1941053002: Allow excluding OS X and iOS specific Google Test extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/secondary/testing/gtest/BUILD.gn

Issue 1941053002: Allow excluding OS X and iOS specific Google Test extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/secondary/testing/gtest/BUILD.gn

diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn

index 79b6bd5d875c435d9a73f5d452bc6c92fa7f0d96..a03ff7c3dae280f840a1ca125bd5f70cbd0fa0e9 100644

--- a/build/secondary/testing/gtest/BUILD.gn

+++ b/build/secondary/testing/gtest/BUILD.gn

@@ -114,7 +114,7 @@ static_library("gtest") {

sources += [ "../platform_test.h" ]

}

- if (is_mac || is_ios) {

+ if ((is_mac || is_ios) && gtest_include_objc_support) {

if (is_ios) {

set_sources_assignment_filter([])

}

@@ -128,7 +128,7 @@ static_library("gtest") {

set_sources_assignment_filter(sources_assignment_filter)

}

- if (is_ios) {

+ if (is_ios && gtest_include_ios_coverage) {

sources += [

"../coverage_util_ios.cc",

"../coverage_util_ios.h",

« no previous file with comments | « no previous file | build_overrides/gtest.gni » ('j') | no next file with comments »