mojo/mojo_base.gyp - Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a

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: mojo/mojo_base.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: android + ios gyp fixes Created 6 years, 1 month 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: mojo/mojo_base.gyp

diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp

index 96305df476d3b316d5efa4f73b525034dbc3f823..bab8c0ed5af6aa6d8f01959750f37af79af83f11 100644

--- a/mojo/mojo_base.gyp

+++ b/mojo/mojo_base.gyp

@@ -71,9 +71,11 @@

'type': 'executable',

'dependencies': [

'../base/base.gyp:base',

+ '../base/base.gyp:test_support_base',

'../base/base.gyp:base_message_loop_tests',

'../testing/gtest.gyp:gtest',

'../url/url.gyp:url_lib',

+ 'edk/mojo_edk.gyp:mojo_system_impl',

'edk/mojo_edk.gyp:mojo_common_test_support',

'edk/mojo_edk.gyp:mojo_run_all_unittests',

'mojo_common_lib',

@@ -85,14 +87,6 @@

'common/common_type_converters_unittest.cc',

'common/handle_watcher_unittest.cc',

'common/message_pump_mojo_unittest.cc',

- 'edk/test/multiprocess_test_helper_unittest.cc',

- ],

- 'conditions': [

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

- 'sources!': [

- 'edk/test/multiprocess_test_helper_unittest.cc',

- ],

- }],

{

« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/public/VERSION » ('j') | no next file with comments »