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

Unified Diff: mojo/edk/mojo_edk.gyp

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 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
« no previous file with comments | « mojo/edk/js/waiting_callback.cc ('k') | mojo/edk/system/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/mojo_edk.gyp
diff --git a/mojo/edk/mojo_edk.gyp b/mojo/edk/mojo_edk.gyp
index 58dae524299a6f149b531b658cf1b1128ddcfd02..e82689372a52aef96b22ccb5945d3121be2a4d95 100644
--- a/mojo/edk/mojo_edk.gyp
+++ b/mojo/edk/mojo_edk.gyp
@@ -28,6 +28,7 @@
'mojo_public_utility_unittests',
'mojo_system_impl',
'mojo_system_unittests',
+ 'mojo_js_unittests',
],
},
{
@@ -112,6 +113,7 @@
],
'include_dirs': [ '../..' ],
'sources': [
+ '../public/cpp/environment/tests/async_wait_unittest.cc',
'../public/cpp/environment/tests/async_waiter_unittest.cc',
'../public/cpp/environment/tests/logger_unittest.cc',
'../public/cpp/environment/tests/logging_unittest.cc',
@@ -203,6 +205,7 @@
'MOJO_USE_SYSTEM_IMPL',
],
'sources': [
+ 'embedder/channel_info_forward.h',
'embedder/channel_init.cc',
'embedder/channel_init.h',
'embedder/embedder.cc',
@@ -234,6 +237,8 @@
'system/channel_endpoint.h',
'system/channel_endpoint_id.cc',
'system/channel_endpoint_id.h',
+ 'system/channel_info.cc',
+ 'system/channel_info.h',
'system/constants.h',
'system/core.cc',
'system/core.h',
@@ -370,6 +375,52 @@
],
},
{
+ # GN version: //mojo/edk/js
+ 'target_name': 'mojo_js_lib',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ '../../gin/gin.gyp:gin',
+ '../../v8/tools/gyp/v8.gyp:v8',
+ ],
+ 'export_dependent_settings': [
+ '../../base/base.gyp:base',
+ '../../gin/gin.gyp:gin',
+ ],
+ 'sources': [
+ # Sources list duplicated in GN build.
+ 'js/core.cc',
+ 'js/core.h',
+ 'js/drain_data.cc',
+ 'js/drain_data.h',
+ 'js/handle.cc',
+ 'js/handle.h',
+ 'js/handle_close_observer.h',
+ 'js/support.cc',
+ 'js/support.h',
+ 'js/waiting_callback.cc',
+ 'js/waiting_callback.h',
+ ],
+ },
+ {
+ # GN version: //mojo/edk/js:js_unittests
+ 'target_name': 'mojo_js_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ '../../gin/gin.gyp:gin_test',
+ 'mojo_common_test_support',
+ 'mojo_run_all_unittests',
+ 'mojo_js_lib',
+ '../public/mojo_public.gyp:mojo_environment_standalone',
+ '../public/mojo_public.gyp:mojo_public_test_interfaces',
+ '../public/mojo_public.gyp:mojo_utility',
+ ],
+ 'sources': [
+ 'js/handle_unittest.cc',
+ 'js/tests/run_js_tests.cc',
+ ],
+ },
+ {
# GN version: //mojo/common/test:test_support_impl
'target_name': 'mojo_test_support_impl',
'type': 'static_library',
« no previous file with comments | « mojo/edk/js/waiting_callback.cc ('k') | mojo/edk/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698