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

Unified Diff: components/nacl.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 | « chrome/test/BUILD.gn ('k') | content/app/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 3b666742d54d5569f5657298010e0eccdd5b5fd7..c7347724473e0e37c7028d352375760146ffbe18 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -78,11 +78,11 @@
'../base/base.gyp:base',
'../base/base.gyp:base_static',
'../ipc/ipc.gyp:ipc',
- '../mojo/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_nacl.gyp:monacl_syscall',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
'../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome',
+ '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
],
'conditions': [
['disable_nacl_untrusted==0', {
@@ -352,11 +352,11 @@
},
'dependencies': [
'nacl_common_win64',
- '../mojo/mojo_edk.gyp:mojo_system_impl_win64',
'../mojo/mojo_nacl.gyp:monacl_syscall_win64',
'../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
'../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
'../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
+ '../third_party/mojo/mojo_edk.gyp:mojo_system_impl_win64',
],
'export_dependent_settings': [
'../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698