testing/gtest.gyp - Issue 903273002: Update from https://crrev.com/315085

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: testing/gtest.gyp

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: testing/gtest.gyp

diff --git a/testing/gtest.gyp b/testing/gtest.gyp

index c4510f66be4087d3b840b1fa25c0e8412ac6fb71..d61772ecbe23323760e2a22a8364697bf88cbe29 100644

--- a/testing/gtest.gyp

+++ b/testing/gtest.gyp

@@ -39,6 +39,7 @@

'sources': [

'gtest_mac.h',

'gtest_mac.mm',

+ 'platform_test_mac.mm',

'link_settings': {

'libraries': [

@@ -46,11 +47,6 @@

}],

- ['OS == "mac"', {

- 'sources': [

- 'platform_test_mac.mm',

- ],

- }],

['OS == "ios"', {

'dependencies' : [

'<(DEPTH)/testing/iossim/iossim.gyp:iossim#host',

@@ -85,7 +81,6 @@

'sources': [

'coverage_util_ios.cc',

'coverage_util_ios.h',

- 'platform_test_ios.mm',

}],

['OS=="ios" and asan==1', {

« no previous file with comments | « testing/buildbot/chromium_trybot.json ('k') | testing/legion/__init__.py » ('j') | no next file with comments »