ipc/mojo/ipc_mojo.gyp - Issue 1554443003: Stop linking in the old Mojo EDK.

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

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge and fix new flaky test Created 4 years, 11 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: ipc/mojo/ipc_mojo.gyp

diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp

index 313ecb2c99c31f66a8bbf0ebd338717db7701153..a60782c3103d498108bcf8e24e7e85725231c49d 100644

--- a/ipc/mojo/ipc_mojo.gyp

+++ b/ipc/mojo/ipc_mojo.gyp

@@ -23,11 +23,10 @@

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

'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

'../../mojo/mojo_base.gyp:mojo_environment_chromium',

- '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',

+ '../../mojo/mojo_edk.gyp:mojo_system_impl',

'../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',

'sources': [

- 'client_channel.mojom',

'async_handle_waiter.cc',

'async_handle_waiter.h',

'ipc_channel_mojo.cc',

@@ -63,8 +62,8 @@

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

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

'../../mojo/mojo_base.gyp:mojo_environment_chromium',

+ '../../mojo/mojo_edk.gyp:mojo_system_impl',

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

- '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',

'../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',

'ipc_mojo',

@@ -91,8 +90,8 @@

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

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

'../../mojo/mojo_base.gyp:mojo_environment_chromium',

+ '../../mojo/mojo_edk.gyp:mojo_system_impl',

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

- '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',

'../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',

'ipc_mojo',

« no previous file with comments | « ipc/mojo/ipc_channel_mojo_unittest.cc ('k') | ipc/mojo/ipc_mojo_bootstrap.h » ('j') | no next file with comments »