| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index ecfa7d013dc654ba664306a13fbe5bdf92c11893..bd0dc85f9d8200454f408688bfa4802344aeb821 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -18,38 +18,38 @@
|
| 'mojo_shell_debug_url%': "",
|
| },
|
| 'includes': [
|
| - 'mojo_apps.gypi',
|
| - 'mojo_examples.gypi',
|
| + #'mojo_apps.gypi',
|
| + #'mojo_examples.gypi',
|
| 'mojo_public.gypi',
|
| - 'mojo_services.gypi',
|
| + #'mojo_services.gypi',
|
| ],
|
| 'targets': [
|
| {
|
| 'target_name': 'mojo',
|
| 'type': 'none',
|
| 'dependencies': [
|
| - 'mojo_apps_js_unittests',
|
| - 'mojo_compositor_app',
|
| + #'mojo_apps_js_unittests',
|
| + #'mojo_compositor_app',
|
| 'mojo_common_lib',
|
| 'mojo_common_unittests',
|
| 'mojo_cpp_bindings',
|
| - 'mojo_js',
|
| - 'mojo_js_bindings',
|
| - 'mojo_js_unittests',
|
| + #'mojo_js',
|
| + #'mojo_js_bindings',
|
| + #'mojo_js_unittests',
|
| 'mojo_message_generator',
|
| - 'mojo_native_viewport_service',
|
| - 'mojo_pepper_container_app',
|
| + #'mojo_native_viewport_service',
|
| + #'mojo_pepper_container_app',
|
| 'mojo_public_test_utils',
|
| 'mojo_public_bindings_unittests',
|
| 'mojo_public_environment_unittests',
|
| 'mojo_public_system_perftests',
|
| 'mojo_public_system_unittests',
|
| 'mojo_public_utility_unittests',
|
| - 'mojo_sample_app',
|
| + #'mojo_sample_app',
|
| 'mojo_service_manager',
|
| 'mojo_service_manager_unittests',
|
| - 'mojo_shell',
|
| - 'mojo_shell_lib',
|
| + #'mojo_shell',
|
| + #'mojo_shell_lib',
|
| 'mojo_system',
|
| 'mojo_system_impl',
|
| 'mojo_system_unittests',
|
| @@ -75,23 +75,23 @@
|
| }],
|
| ]
|
| },
|
| - {
|
| - 'target_name': 'mojo_external_service_bindings',
|
| - 'type': 'static_library',
|
| - 'sources': [
|
| - 'shell/external_service.mojom',
|
| - ],
|
| - 'variables': {
|
| - 'mojom_base_output_dir': 'mojo',
|
| - },
|
| - 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
|
| - 'export_dependent_settings': [
|
| - 'mojo_cpp_bindings',
|
| - ],
|
| - 'dependencies': [
|
| - 'mojo_cpp_bindings',
|
| - ],
|
| - },
|
| +# {
|
| +# 'target_name': 'mojo_external_service_bindings',
|
| +# 'type': 'static_library',
|
| +# 'sources': [
|
| +# 'shell/external_service.mojom',
|
| +# ],
|
| +# 'variables': {
|
| +# 'mojom_base_output_dir': 'mojo',
|
| +# },
|
| +# 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
|
| +# 'export_dependent_settings': [
|
| +# 'mojo_cpp_bindings',
|
| +# ],
|
| +# 'dependencies': [
|
| +# 'mojo_cpp_bindings',
|
| +# ],
|
| +# },
|
| {
|
| 'target_name': 'mojo_run_all_unittests',
|
| 'type': 'static_library',
|
| @@ -230,7 +230,8 @@
|
| 'system/local_data_pipe_unittest.cc',
|
| 'system/message_pipe_dispatcher_unittest.cc',
|
| 'system/message_pipe_unittest.cc',
|
| - 'system/multiprocess_message_pipe_unittest.cc',
|
| + # This file doesn't build (and isn't relevant) on iOS.
|
| + #'system/multiprocess_message_pipe_unittest.cc',
|
| 'system/raw_channel_unittest.cc',
|
| 'system/raw_shared_buffer_unittest.cc',
|
| 'system/remote_message_pipe_unittest.cc',
|
| @@ -244,34 +245,34 @@
|
| 'system/waiter_unittest.cc',
|
| ],
|
| },
|
| - {
|
| - 'target_name': 'mojo_gles2_impl',
|
| - 'type': '<(component)',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - '../gpu/gpu.gyp:command_buffer_client',
|
| - '../gpu/gpu.gyp:command_buffer_common',
|
| - '../gpu/gpu.gyp:gles2_cmd_helper',
|
| - '../gpu/gpu.gyp:gles2_implementation',
|
| - 'mojo_gles2',
|
| - 'mojo_gles2_bindings',
|
| - 'mojo_environment_chromium',
|
| - 'mojo_system_impl',
|
| - ],
|
| - 'defines': [
|
| - 'MOJO_GLES2_IMPL_IMPLEMENTATION',
|
| - ],
|
| - 'sources': [
|
| - 'gles2/command_buffer_client_impl.cc',
|
| - 'gles2/command_buffer_client_impl.h',
|
| - 'gles2/gles2_impl_export.h',
|
| - 'gles2/gles2_support_impl.cc',
|
| - 'gles2/gles2_support_impl.h',
|
| - 'gles2/gles2_context.cc',
|
| - 'gles2/gles2_context.h',
|
| - ],
|
| - },
|
| +# {
|
| +# 'target_name': 'mojo_gles2_impl',
|
| +# 'type': '<(component)',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| +# '../gpu/gpu.gyp:command_buffer_client',
|
| +# '../gpu/gpu.gyp:command_buffer_common',
|
| +# '../gpu/gpu.gyp:gles2_cmd_helper',
|
| +# '../gpu/gpu.gyp:gles2_implementation',
|
| +# 'mojo_gles2',
|
| +# 'mojo_gles2_bindings',
|
| +# 'mojo_environment_chromium',
|
| +# 'mojo_system_impl',
|
| +# ],
|
| +# 'defines': [
|
| +# 'MOJO_GLES2_IMPL_IMPLEMENTATION',
|
| +# ],
|
| +# 'sources': [
|
| +# 'gles2/command_buffer_client_impl.cc',
|
| +# 'gles2/command_buffer_client_impl.h',
|
| +# 'gles2/gles2_impl_export.h',
|
| +# 'gles2/gles2_support_impl.cc',
|
| +# 'gles2/gles2_support_impl.h',
|
| +# 'gles2/gles2_context.cc',
|
| +# 'gles2/gles2_context.h',
|
| +# ],
|
| +# },
|
| {
|
| 'target_name': 'mojo_test_support_impl',
|
| 'type': 'static_library',
|
| @@ -324,8 +325,9 @@
|
| 'mojo_system_impl',
|
| ],
|
| 'sources': [
|
| - 'common/test/multiprocess_test_helper.cc',
|
| - 'common/test/multiprocess_test_helper.h',
|
| + # Building the below files on iOS causes linker errors.
|
| + #'common/test/multiprocess_test_helper.cc',
|
| + #'common/test/multiprocess_test_helper.h',
|
| 'common/test/test_utils.h',
|
| 'common/test/test_utils_posix.cc',
|
| 'common/test/test_utils_win.cc',
|
| @@ -349,7 +351,8 @@
|
| 'common/common_type_converters_unittest.cc',
|
| 'common/handle_watcher_unittest.cc',
|
| 'common/message_pump_mojo_unittest.cc',
|
| - 'common/test/multiprocess_test_helper_unittest.cc',
|
| + # This file doesn't build (and isn't relevant) on iOS.
|
| + #'common/test/multiprocess_test_helper_unittest.cc',
|
| ],
|
| },
|
| {
|
| @@ -419,136 +422,136 @@
|
| 'mojo_shell_bindings',
|
| ],
|
| },
|
| - {
|
| - 'target_name': 'mojo_spy',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_static',
|
| - '../net/net.gyp:http_server',
|
| - '../url/url.gyp:url_lib',
|
| - 'mojo_service_manager',
|
| - ],
|
| - 'sources': [
|
| - 'spy/spy.cc',
|
| - 'spy/spy.h',
|
| - 'spy/websocket_server.cc',
|
| - 'spy/websocket_server.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'mojo_shell_lib',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_static',
|
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - '../net/net.gyp:net',
|
| - '../url/url.gyp:url_lib',
|
| - 'mojo_external_service_bindings',
|
| - 'mojo_gles2_impl',
|
| - 'mojo_service_manager',
|
| - 'mojo_shell_bindings',
|
| - 'mojo_system_impl',
|
| - 'mojo_native_viewport_service',
|
| - 'mojo_spy',
|
| - ],
|
| - 'variables': {
|
| - 'mojom_base_output_dir': 'mojo',
|
| - },
|
| - 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
|
| - 'sources': [
|
| - 'shell/app_child_process.cc',
|
| - 'shell/app_child_process.h',
|
| - 'shell/app_child_process.mojom',
|
| - 'shell/app_child_process_host.cc',
|
| - 'shell/app_child_process_host.h',
|
| - 'shell/child_process.cc',
|
| - 'shell/child_process.h',
|
| - 'shell/child_process_host.cc',
|
| - 'shell/child_process_host.h',
|
| - 'shell/context.cc',
|
| - 'shell/context.h',
|
| - 'shell/dbus_service_loader_linux.cc',
|
| - 'shell/dbus_service_loader_linux.h',
|
| - 'shell/dynamic_service_loader.cc',
|
| - 'shell/dynamic_service_loader.h',
|
| - 'shell/dynamic_service_runner.h',
|
| - 'shell/init.cc',
|
| - 'shell/init.h',
|
| - 'shell/in_process_dynamic_service_runner.cc',
|
| - 'shell/in_process_dynamic_service_runner.h',
|
| - 'shell/keep_alive.cc',
|
| - 'shell/keep_alive.h',
|
| - 'shell/loader.cc',
|
| - 'shell/loader.h',
|
| - 'shell/network_delegate.cc',
|
| - 'shell/network_delegate.h',
|
| - 'shell/out_of_process_dynamic_service_runner.cc',
|
| - 'shell/out_of_process_dynamic_service_runner.h',
|
| - 'shell/run.cc',
|
| - 'shell/run.h',
|
| - 'shell/storage.cc',
|
| - 'shell/storage.h',
|
| - 'shell/switches.cc',
|
| - 'shell/switches.h',
|
| - 'shell/task_runners.cc',
|
| - 'shell/task_runners.h',
|
| - 'shell/test_child_process.cc',
|
| - 'shell/test_child_process.h',
|
| - 'shell/url_request_context_getter.cc',
|
| - 'shell/url_request_context_getter.h',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="linux"', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:dbus',
|
| - '../dbus/dbus.gyp:dbus',
|
| - ],
|
| - }],
|
| - ['use_aura==1', {
|
| - 'dependencies': [
|
| - # These are only necessary as long as we hard code use of ViewManager.
|
| - '../skia/skia.gyp:skia',
|
| - 'mojo_shell_client',
|
| - 'mojo_view_manager',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'mojo_shell_test_support',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_static',
|
| - '../url/url.gyp:url_lib',
|
| - 'mojo_service_manager',
|
| - 'mojo_shell_lib',
|
| - 'mojo_system_impl',
|
| - ],
|
| - 'sources': [
|
| - 'shell/shell_test_helper.cc',
|
| - 'shell/shell_test_helper.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'mojo_shell',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../ui/gl/gl.gyp:gl',
|
| - '../url/url.gyp:url_lib',
|
| - 'mojo_common_lib',
|
| - 'mojo_environment_chromium',
|
| - 'mojo_service_manager',
|
| - 'mojo_shell_lib',
|
| - 'mojo_system_impl',
|
| - ],
|
| - 'sources': [
|
| - 'shell/desktop/mojo_main.cc',
|
| - ],
|
| - },
|
| +# {
|
| +# 'target_name': 'mojo_spy',
|
| +# 'type': 'static_library',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../base/base.gyp:base_static',
|
| +# '../net/net.gyp:http_server',
|
| +# '../url/url.gyp:url_lib',
|
| +# 'mojo_service_manager',
|
| +# ],
|
| +# 'sources': [
|
| +# 'spy/spy.cc',
|
| +# 'spy/spy.h',
|
| +# 'spy/websocket_server.cc',
|
| +# 'spy/websocket_server.h',
|
| +# ],
|
| +# },
|
| +# {
|
| +# 'target_name': 'mojo_shell_lib',
|
| +# 'type': 'static_library',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../base/base.gyp:base_static',
|
| +# '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| +# '../net/net.gyp:net',
|
| +# '../url/url.gyp:url_lib',
|
| +# 'mojo_external_service_bindings',
|
| +# 'mojo_gles2_impl',
|
| +# 'mojo_service_manager',
|
| +# 'mojo_shell_bindings',
|
| +# 'mojo_system_impl',
|
| +# 'mojo_native_viewport_service',
|
| +# 'mojo_spy',
|
| +# ],
|
| +# 'variables': {
|
| +# 'mojom_base_output_dir': 'mojo',
|
| +# },
|
| +# 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
|
| +# 'sources': [
|
| +# 'shell/app_child_process.cc',
|
| +# 'shell/app_child_process.h',
|
| +# 'shell/app_child_process.mojom',
|
| +# 'shell/app_child_process_host.cc',
|
| +# 'shell/app_child_process_host.h',
|
| +# 'shell/child_process.cc',
|
| +# 'shell/child_process.h',
|
| +# 'shell/child_process_host.cc',
|
| +# 'shell/child_process_host.h',
|
| +# 'shell/context.cc',
|
| +# 'shell/context.h',
|
| +# 'shell/dbus_service_loader_linux.cc',
|
| +# 'shell/dbus_service_loader_linux.h',
|
| +# 'shell/dynamic_service_loader.cc',
|
| +# 'shell/dynamic_service_loader.h',
|
| +# 'shell/dynamic_service_runner.h',
|
| +# 'shell/init.cc',
|
| +# 'shell/init.h',
|
| +# 'shell/in_process_dynamic_service_runner.cc',
|
| +# 'shell/in_process_dynamic_service_runner.h',
|
| +# 'shell/keep_alive.cc',
|
| +# 'shell/keep_alive.h',
|
| +# 'shell/loader.cc',
|
| +# 'shell/loader.h',
|
| +# 'shell/network_delegate.cc',
|
| +# 'shell/network_delegate.h',
|
| +# 'shell/out_of_process_dynamic_service_runner.cc',
|
| +# 'shell/out_of_process_dynamic_service_runner.h',
|
| +# 'shell/run.cc',
|
| +# 'shell/run.h',
|
| +# 'shell/storage.cc',
|
| +# 'shell/storage.h',
|
| +# 'shell/switches.cc',
|
| +# 'shell/switches.h',
|
| +# 'shell/task_runners.cc',
|
| +# 'shell/task_runners.h',
|
| +# 'shell/test_child_process.cc',
|
| +# 'shell/test_child_process.h',
|
| +# 'shell/url_request_context_getter.cc',
|
| +# 'shell/url_request_context_getter.h',
|
| +# ],
|
| +# 'conditions': [
|
| +# ['OS=="linux"', {
|
| +# 'dependencies': [
|
| +# '../build/linux/system.gyp:dbus',
|
| +# '../dbus/dbus.gyp:dbus',
|
| +# ],
|
| +# }],
|
| +# ['use_aura==1', {
|
| +# 'dependencies': [
|
| +# # These are only necessary as long as we hard code use of ViewManager.
|
| +# '../skia/skia.gyp:skia',
|
| +# 'mojo_shell_client',
|
| +# 'mojo_view_manager',
|
| +# ],
|
| +# }],
|
| +# ],
|
| +# },
|
| +# {
|
| +# 'target_name': 'mojo_shell_test_support',
|
| +# 'type': 'static_library',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../base/base.gyp:base_static',
|
| +# '../url/url.gyp:url_lib',
|
| +# 'mojo_service_manager',
|
| +# 'mojo_shell_lib',
|
| +# 'mojo_system_impl',
|
| +# ],
|
| +# 'sources': [
|
| +# 'shell/shell_test_helper.cc',
|
| +# 'shell/shell_test_helper.h',
|
| +# ],
|
| +# },
|
| +# {
|
| +# 'target_name': 'mojo_shell',
|
| +# 'type': 'executable',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../ui/gl/gl.gyp:gl',
|
| +# '../url/url.gyp:url_lib',
|
| +# 'mojo_common_lib',
|
| +# 'mojo_environment_chromium',
|
| +# 'mojo_service_manager',
|
| +# 'mojo_shell_lib',
|
| +# 'mojo_system_impl',
|
| +# ],
|
| +# 'sources': [
|
| +# 'shell/desktop/mojo_main.cc',
|
| +# ],
|
| +# },
|
| {
|
| 'target_name': 'mojo_service_manager_unittests',
|
| 'type': 'executable',
|
| @@ -572,47 +575,47 @@
|
| 'service_manager/test.mojom',
|
| ],
|
| },
|
| - {
|
| - 'target_name': 'mojo_js_bindings_lib',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - '../gin/gin.gyp:gin',
|
| - '../v8/tools/gyp/v8.gyp:v8',
|
| - 'mojo_common_lib',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - '../base/base.gyp:base',
|
| - '../gin/gin.gyp:gin',
|
| - 'mojo_common_lib',
|
| - ],
|
| - 'sources': [
|
| - 'bindings/js/core.cc',
|
| - 'bindings/js/core.h',
|
| - 'bindings/js/handle.cc',
|
| - 'bindings/js/handle.h',
|
| - 'bindings/js/support.cc',
|
| - 'bindings/js/support.h',
|
| - 'bindings/js/unicode.cc',
|
| - 'bindings/js/unicode.h',
|
| - 'bindings/js/waiting_callback.cc',
|
| - 'bindings/js/waiting_callback.h',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'mojo_js_unittests',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../gin/gin.gyp:gin_test',
|
| - 'mojo_common_test_support',
|
| - 'mojo_js_bindings_lib',
|
| - 'mojo_run_all_unittests',
|
| - 'mojo_public_test_interfaces',
|
| - ],
|
| - 'sources': [
|
| - 'bindings/js/run_js_tests.cc',
|
| - ],
|
| - },
|
| +# {
|
| +# 'target_name': 'mojo_js_bindings_lib',
|
| +# 'type': 'static_library',
|
| +# 'dependencies': [
|
| +# '../base/base.gyp:base',
|
| +# '../gin/gin.gyp:gin',
|
| +# '../v8/tools/gyp/v8.gyp:v8',
|
| +# 'mojo_common_lib',
|
| +# ],
|
| +# 'export_dependent_settings': [
|
| +# '../base/base.gyp:base',
|
| +# '../gin/gin.gyp:gin',
|
| +# 'mojo_common_lib',
|
| +# ],
|
| +# 'sources': [
|
| +# 'bindings/js/core.cc',
|
| +# 'bindings/js/core.h',
|
| +# 'bindings/js/handle.cc',
|
| +# 'bindings/js/handle.h',
|
| +# 'bindings/js/support.cc',
|
| +# 'bindings/js/support.h',
|
| +# 'bindings/js/unicode.cc',
|
| +# 'bindings/js/unicode.h',
|
| +# 'bindings/js/waiting_callback.cc',
|
| +# 'bindings/js/waiting_callback.h',
|
| +# ],
|
| +# },
|
| +# {
|
| +# 'target_name': 'mojo_js_unittests',
|
| +# 'type': 'executable',
|
| +# 'dependencies': [
|
| +# '../gin/gin.gyp:gin_test',
|
| +# 'mojo_common_test_support',
|
| +# 'mojo_js_bindings_lib',
|
| +# 'mojo_run_all_unittests',
|
| +# 'mojo_public_test_interfaces',
|
| +# ],
|
| +# 'sources': [
|
| +# 'bindings/js/run_js_tests.cc',
|
| +# ],
|
| +# },
|
| {
|
| 'target_name': 'mojo_message_generator',
|
| 'type': 'executable',
|
|
|
Chromium Code Reviews
