mojo/mojo_base.gyp - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

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 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 5 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 44879eb876fa3aed128243b7d8bb8a785d84b03f..9c308c6f526b45f1fdf2c4ba7a68fd75fdc4c3cc 100644

--- a/mojo/mojo_base.gyp

+++ b/mojo/mojo_base.gyp

@@ -156,13 +156,13 @@

'sources': [

# TODO(vtl): This is kind of ugly. (See TODO in logging.h.)

- "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h",

- "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc",

- "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",

- "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",

- "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",

- "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",

+ "../mojo/public/cpp/environment/async_waiter.h",

+ "../mojo/public/cpp/environment/lib/async_waiter.cc",

+ "../mojo/public/cpp/environment/lib/logging.cc",

+ "../mojo/public/cpp/environment/lib/scoped_task_tracking.cc",

+ "../mojo/public/cpp/environment/logging.h",

+ "../mojo/public/cpp/environment/task_tracker.h",

'environment/environment.cc',

'include_dirs': [

« no previous file with comments | « mojo/message_pump/message_pump_mojo_unittest.cc ('k') | mojo/mojo_public_gles2_for_loadable_module.gypi » ('j') | no next file with comments »