content/content_common.gypi - Issue 814543006: Move //mojo/{public, edk} underneath //third_party

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: content/content_common.gypi

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 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: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 42a2e65e593a7ee77d975c982a2871e5e8b403c2..1948e36a05dc5e8a894d57d66a6da8ed2d6048d6 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -576,17 +576,17 @@

'../media/media.gyp:media',

'../media/media.gyp:shared_memory_support',

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

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

- '../mojo/mojo_public.gyp:mojo_application_bindings',

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

'../storage/storage_common.gyp:storage_common',

'../third_party/WebKit/public/blink.gyp:blink',

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

+ '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',

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

'../ui/gl/gl.gyp:gl',

'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',

'export_dependent_settings' : [

- '../mojo/mojo_public.gyp:mojo_application_bindings',

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

+ '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',

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

'actions': [

{

« no previous file with comments | « content/content_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('j') | no next file with comments »