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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Essential components (and their tests) that are needed to build 5 # Essential components (and their tests) that are needed to build
6 # Chrome should be here. Other components that are useful only in 6 # Chrome should be here. Other components that are useful only in
7 # Mojo land like mojo_shell should be in mojo.gyp. 7 # Mojo land like mojo_shell should be in mojo.gyp.
8 { 8 {
9 'includes': [ 9 'includes': [
10 '../mojo_variables.gypi', 10 '../mojo_variables.gypi',
(...skipping 10 matching lines...) Expand all
21 # to be built. 21 # to be built.
22 'mojo_message_pipe_perftests', 22 'mojo_message_pipe_perftests',
23 'mojo_public_application_unittests', 23 'mojo_public_application_unittests',
24 'mojo_public_bindings_unittests', 24 'mojo_public_bindings_unittests',
25 'mojo_public_environment_unittests', 25 'mojo_public_environment_unittests',
26 'mojo_public_system_perftests', 26 'mojo_public_system_perftests',
27 'mojo_public_system_unittests', 27 'mojo_public_system_unittests',
28 'mojo_public_utility_unittests', 28 'mojo_public_utility_unittests',
29 'mojo_system_impl', 29 'mojo_system_impl',
30 'mojo_system_unittests', 30 'mojo_system_unittests',
31 'mojo_js_unittests',
31 ], 32 ],
32 }, 33 },
33 { 34 {
34 'target_name': 'mojo_none', 35 'target_name': 'mojo_none',
35 'type': 'none', 36 'type': 'none',
36 }, 37 },
37 { 38 {
38 # GN version: //mojo/edk/test:run_all_unittests 39 # GN version: //mojo/edk/test:run_all_unittests
39 'target_name': 'mojo_run_all_unittests', 40 'target_name': 'mojo_run_all_unittests',
40 'type': 'static_library', 41 'type': 'static_library',
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 'type': 'executable', 106 'type': 'executable',
106 'dependencies': [ 107 'dependencies': [
107 '../../testing/gtest.gyp:gtest', 108 '../../testing/gtest.gyp:gtest',
108 'mojo_run_all_unittests', 109 'mojo_run_all_unittests',
109 '../public/mojo_public.gyp:mojo_environment_standalone', 110 '../public/mojo_public.gyp:mojo_environment_standalone',
110 '../public/mojo_public.gyp:mojo_public_test_utils', 111 '../public/mojo_public.gyp:mojo_public_test_utils',
111 '../public/mojo_public.gyp:mojo_utility', 112 '../public/mojo_public.gyp:mojo_utility',
112 ], 113 ],
113 'include_dirs': [ '../..' ], 114 'include_dirs': [ '../..' ],
114 'sources': [ 115 'sources': [
116 '../public/cpp/environment/tests/async_wait_unittest.cc',
115 '../public/cpp/environment/tests/async_waiter_unittest.cc', 117 '../public/cpp/environment/tests/async_waiter_unittest.cc',
116 '../public/cpp/environment/tests/logger_unittest.cc', 118 '../public/cpp/environment/tests/logger_unittest.cc',
117 '../public/cpp/environment/tests/logging_unittest.cc', 119 '../public/cpp/environment/tests/logging_unittest.cc',
118 ], 120 ],
119 }, 121 },
120 { 122 {
121 # GN version: //mojo/public/cpp/application/tests:mojo_public_application_ unittests 123 # GN version: //mojo/public/cpp/application/tests:mojo_public_application_ unittests
122 'target_name': 'mojo_public_application_unittests', 124 'target_name': 'mojo_public_application_unittests',
123 'type': 'executable', 125 'type': 'executable',
124 'dependencies': [ 126 'dependencies': [
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 'dependencies': [ 198 'dependencies': [
197 '../../base/base.gyp:base', 199 '../../base/base.gyp:base',
198 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 200 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
199 ], 201 ],
200 'defines': [ 202 'defines': [
201 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 203 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
202 'MOJO_SYSTEM_IMPLEMENTATION', 204 'MOJO_SYSTEM_IMPLEMENTATION',
203 'MOJO_USE_SYSTEM_IMPL', 205 'MOJO_USE_SYSTEM_IMPL',
204 ], 206 ],
205 'sources': [ 207 'sources': [
208 'embedder/channel_info_forward.h',
206 'embedder/channel_init.cc', 209 'embedder/channel_init.cc',
207 'embedder/channel_init.h', 210 'embedder/channel_init.h',
208 'embedder/embedder.cc', 211 'embedder/embedder.cc',
209 'embedder/embedder.h', 212 'embedder/embedder.h',
210 'embedder/platform_channel_pair.cc', 213 'embedder/platform_channel_pair.cc',
211 'embedder/platform_channel_pair.h', 214 'embedder/platform_channel_pair.h',
212 'embedder/platform_channel_pair_posix.cc', 215 'embedder/platform_channel_pair_posix.cc',
213 'embedder/platform_channel_pair_win.cc', 216 'embedder/platform_channel_pair_win.cc',
214 'embedder/platform_channel_utils_posix.cc', 217 'embedder/platform_channel_utils_posix.cc',
215 'embedder/platform_channel_utils_posix.h', 218 'embedder/platform_channel_utils_posix.h',
(...skipping 11 matching lines...) Expand all
227 'embedder/simple_platform_shared_buffer_posix.cc', 230 'embedder/simple_platform_shared_buffer_posix.cc',
228 'embedder/simple_platform_shared_buffer_win.cc', 231 'embedder/simple_platform_shared_buffer_win.cc',
229 'embedder/simple_platform_support.cc', 232 'embedder/simple_platform_support.cc',
230 'embedder/simple_platform_support.h', 233 'embedder/simple_platform_support.h',
231 'system/channel.cc', 234 'system/channel.cc',
232 'system/channel.h', 235 'system/channel.h',
233 'system/channel_endpoint.cc', 236 'system/channel_endpoint.cc',
234 'system/channel_endpoint.h', 237 'system/channel_endpoint.h',
235 'system/channel_endpoint_id.cc', 238 'system/channel_endpoint_id.cc',
236 'system/channel_endpoint_id.h', 239 'system/channel_endpoint_id.h',
240 'system/channel_info.cc',
241 'system/channel_info.h',
237 'system/constants.h', 242 'system/constants.h',
238 'system/core.cc', 243 'system/core.cc',
239 'system/core.h', 244 'system/core.h',
240 'system/data_pipe.cc', 245 'system/data_pipe.cc',
241 'system/data_pipe.h', 246 'system/data_pipe.h',
242 'system/data_pipe_consumer_dispatcher.cc', 247 'system/data_pipe_consumer_dispatcher.cc',
243 'system/data_pipe_consumer_dispatcher.h', 248 'system/data_pipe_consumer_dispatcher.h',
244 'system/data_pipe_producer_dispatcher.cc', 249 'system/data_pipe_producer_dispatcher.cc',
245 'system/data_pipe_producer_dispatcher.h', 250 'system/data_pipe_producer_dispatcher.h',
246 'system/dispatcher.cc', 251 'system/dispatcher.cc',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 ], 368 ],
364 'sources': [ 369 'sources': [
365 'system/message_pipe_perftest.cc', 370 'system/message_pipe_perftest.cc',
366 'system/message_pipe_test_utils.h', 371 'system/message_pipe_test_utils.h',
367 'system/message_pipe_test_utils.cc', 372 'system/message_pipe_test_utils.cc',
368 'system/test_utils.cc', 373 'system/test_utils.cc',
369 'system/test_utils.h', 374 'system/test_utils.h',
370 ], 375 ],
371 }, 376 },
372 { 377 {
378 # GN version: //mojo/edk/js
379 'target_name': 'mojo_js_lib',
380 'type': 'static_library',
381 'dependencies': [
382 '../../base/base.gyp:base',
383 '../../gin/gin.gyp:gin',
384 '../../v8/tools/gyp/v8.gyp:v8',
385 ],
386 'export_dependent_settings': [
387 '../../base/base.gyp:base',
388 '../../gin/gin.gyp:gin',
389 ],
390 'sources': [
391 # Sources list duplicated in GN build.
392 'js/core.cc',
393 'js/core.h',
394 'js/drain_data.cc',
395 'js/drain_data.h',
396 'js/handle.cc',
397 'js/handle.h',
398 'js/handle_close_observer.h',
399 'js/support.cc',
400 'js/support.h',
401 'js/waiting_callback.cc',
402 'js/waiting_callback.h',
403 ],
404 },
405 {
406 # GN version: //mojo/edk/js:js_unittests
407 'target_name': 'mojo_js_unittests',
408 'type': 'executable',
409 'dependencies': [
410 '../../gin/gin.gyp:gin_test',
411 'mojo_common_test_support',
412 'mojo_run_all_unittests',
413 'mojo_js_lib',
414 '../public/mojo_public.gyp:mojo_environment_standalone',
415 '../public/mojo_public.gyp:mojo_public_test_interfaces',
416 '../public/mojo_public.gyp:mojo_utility',
417 ],
418 'sources': [
419 'js/handle_unittest.cc',
420 'js/tests/run_js_tests.cc',
421 ],
422 },
423 {
373 # GN version: //mojo/common/test:test_support_impl 424 # GN version: //mojo/common/test:test_support_impl
374 'target_name': 'mojo_test_support_impl', 425 'target_name': 'mojo_test_support_impl',
375 'type': 'static_library', 426 'type': 'static_library',
376 'dependencies': [ 427 'dependencies': [
377 '../../base/base.gyp:base', 428 '../../base/base.gyp:base',
378 ], 429 ],
379 'sources': [ 430 'sources': [
380 'test/test_support_impl.cc', 431 'test/test_support_impl.cc',
381 'test/test_support_impl.h', 432 'test/test_support_impl.h',
382 ], 433 ],
(...skipping 18 matching lines...) Expand all
401 'conditions': [ 452 'conditions': [
402 ['OS=="ios"', { 453 ['OS=="ios"', {
403 'sources!': [ 454 'sources!': [
404 'test/multiprocess_test_helper.cc', 455 'test/multiprocess_test_helper.cc',
405 ], 456 ],
406 }], 457 }],
407 ], 458 ],
408 }, 459 },
409 ], 460 ],
410 } 461 }
OLDNEW
« 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