testing/gmock.gyp - Issue 683113005: Update from chromium https://crrev.com/302282

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/gmock.gyp

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

Patch Set: Created 6 years, 2 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/gmock.gyp

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

index 22a1893bd2a73465539febfd3c05555e44e114d5..6363b4b1838cc5c44d3eb5fea99a58b7362a77a6 100644

--- a/testing/gmock.gyp

+++ b/testing/gmock.gyp

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

'export_dependent_settings': [

'gtest.gyp:gtest',

+ 'conditions': [

+ ['OS == "ios"', {

+ 'toolsets': ['host', 'target'],

+ }],

+ ],

{

'target_name': 'gmock_main',

« no previous file with comments | « testing/chromoting/browser_test_commands_linux.txt ('k') | testing/iossim/iossim.mm » ('j') | no next file with comments »