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

Unified Diff: third_party/mojo/mojo_edk.gyp

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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 | « mojo/services/html_viewer/html_viewer.cc ('k') | third_party/mojo/mojo_edk_system_impl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/mojo_edk.gyp
diff --git a/third_party/mojo/mojo_edk.gyp b/third_party/mojo/mojo_edk.gyp
index 01edb62f99a96e28014c4363400342d218a2366d..20aa38aca88d0923d3232c15adacb7d848d8a041 100644
--- a/third_party/mojo/mojo_edk.gyp
+++ b/third_party/mojo/mojo_edk.gyp
@@ -24,6 +24,7 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../../crypto/crypto.gyp:crypto',
],
'includes': [
'mojo_edk_system_impl.gypi',
@@ -86,6 +87,8 @@
'sources': [
'src/mojo/edk/test/multiprocess_test_helper.cc',
'src/mojo/edk/test/multiprocess_test_helper.h',
+ 'src/mojo/edk/test/scoped_ipc_support.cc',
+ 'src/mojo/edk/test/scoped_ipc_support.h',
'src/mojo/edk/test/test_utils.h',
'src/mojo/edk/test/test_utils_posix.cc',
'src/mojo/edk/test/test_utils_win.cc',
@@ -138,6 +141,7 @@
'dependencies': [
'../../base/base.gyp:base_win64',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+ '../../crypto/crypto.gyp:crypto_nacl_win64',
],
'includes': [
'mojo_edk_system_impl.gypi',
« no previous file with comments | « mojo/services/html_viewer/html_viewer.cc ('k') | third_party/mojo/mojo_edk_system_impl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698