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

Unified Diff: extensions/extensions.gyp

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a1f2f8b320e0e66282673f5553d9e063cdf84ece..e7e9b3796ae8ce71b1ec41fce95462f9441107fc 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -15,7 +15,7 @@
# generated cpp files must be listed explicitly in extensions_common
'type': 'none',
'includes': [
- '../mojo/mojom_bindings_generator.gypi',
+ '../third_party/mojo/mojom_bindings_generator.gypi',
],
'sources': [
'common/mojo/keep_alive.mojom',
@@ -867,8 +867,8 @@
'extensions_resources.gyp:extensions_resources',
'../content/content.gyp:content_resources',
'../gin/gin.gyp:gin',
- '../mojo/mojo_public.gyp:mojo_js_bindings',
'../third_party/WebKit/public/blink.gyp:blink',
+ '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
],
'include_dirs': [
'..',
@@ -1181,12 +1181,12 @@
'../device/serial/serial.gyp:device_serial',
'../device/serial/serial.gyp:device_serial_test_util',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/mojo_edk.gyp:mojo_js_lib',
- '../mojo/mojo_edk.gyp:mojo_system_impl',
- '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+ '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
+ '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+ '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'common/api/api.gyp:cast_channel_proto',
'extensions_common',
'extensions_renderer',
« no previous file with comments | « extensions/common/BUILD.gn ('k') | extensions/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698