third_party/mojo/mojo_variables.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: third_party/mojo/mojo_variables.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: third_party/mojo/mojo_variables.gypi

diff --git a/mojo/mojo_variables.gypi b/third_party/mojo/mojo_variables.gypi

similarity index 68%

rename from mojo/mojo_variables.gypi

rename to third_party/mojo/mojo_variables.gypi

index 6ec89a04cc249c51197ac30e9bef2d8ccada5c0a..0e082f302b44fe16e0d0d10e677a734b5b3f81e0 100644

--- a/mojo/mojo_variables.gypi

+++ b/third_party/mojo/mojo_variables.gypi

@@ -32,21 +32,21 @@

# which Mojo system library they are using.

['component=="shared_library"', {

- 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",

- 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",

'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl",

+ 'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",

+ 'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",

}, {

- 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system_placeholder",

- 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system",

'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",

+ 'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system_placeholder",

+ 'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system",

}],

'mojo_public_system_unittest_sources': [

- '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc',

- '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c',

- '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc',

- '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc',

- '<(DEPTH)/mojo/public/cpp/system/tests/macros_unittest.cc',

+ '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc',

+ '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c',

+ '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc',

+ '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc',

+ '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc',

}

« no previous file with comments | « third_party/mojo/mojo_public.gyp ('k') | third_party/mojo/mojom_bindings_generator.gypi » ('j') | no next file with comments »