Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: content/content_common.gypi

Issue 807773002: Move mojo gypfiles to toplevel mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ca711176efbb05a5896acd297982d948efdd5d51..e32344fe64848c9d57a224538c64311c2619a12e 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -570,10 +570,10 @@
'../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
'../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
- '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/public/mojo_public.gyp:mojo_application_bindings',
- '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../mojo/mojo_public.gyp:mojo_application_bindings',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../storage/storage_browser.gyp:storage',
'../storage/storage_common.gyp:storage_common',
'../third_party/WebKit/public/blink.gyp:blink',
@@ -581,8 +581,8 @@
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
],
'export_dependent_settings' : [
- '../mojo/public/mojo_public.gyp:mojo_application_bindings',
- '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_public.gyp:mojo_application_bindings',
+ '../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 »

Powered by Google App Engine
This is Rietveld 408576698