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

Unified Diff: mojo/mojo.gyp

Issue 360563004: Enable Mojo on iOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reduce diff in mojo_public.gypi Created 6 years, 6 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 | « content/content_app.gypi ('k') | mojo/mojo_public.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 69665f197132375ff41b761c02bb870514a4844d..30baa1ef77130f951b5409dca9dc449bcc0c8852 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -18,33 +18,17 @@
'mojo_shell_debug_url%': "",
},
'includes': [
- 'mojo_apps.gypi',
- 'mojo_examples.gypi',
'mojo_public.gypi',
- 'mojo_services.gypi',
],
'targets': [
{
'target_name': 'mojo',
'type': 'none',
'dependencies': [
- 'mojo_apps_js_unittests',
- 'mojo_compositor_app',
'mojo_common_lib',
'mojo_common_unittests',
'mojo_cpp_bindings',
- 'mojo_geometry_lib',
- 'mojo_html_viewer',
- 'mojo_js',
- 'mojo_js_bindings',
- 'mojo_js_unittests',
- 'mojo_launcher',
'mojo_message_generator',
- 'mojo_native_viewport_service',
- 'mojo_network_service',
- 'mojo_pepper_container_app',
- 'mojo_png_viewer',
- 'mojo_profile_service',
'mojo_public_application_unittests',
'mojo_public_test_utils',
'mojo_public_bindings_unittests',
@@ -52,22 +36,39 @@
'mojo_public_system_perftests',
'mojo_public_system_unittests',
'mojo_public_utility_unittests',
- 'mojo_sample_app',
'mojo_service_manager',
'mojo_service_manager_unittests',
- 'mojo_shell',
- 'mojo_shell_lib',
- 'mojo_shell_tests',
'mojo_system',
'mojo_system_impl',
'mojo_system_unittests',
- 'mojo_test_service',
'mojo_utility',
- 'mojo_view_manager_lib',
- 'mojo_view_manager_lib_unittests',
- 'mojo_wget',
],
'conditions': [
+ ['OS != "ios"', {
+ 'dependencies': [
+ 'mojo_apps_js_unittests',
+ 'mojo_compositor_app',
+ 'mojo_geometry_lib',
+ 'mojo_html_viewer',
+ 'mojo_js',
+ 'mojo_js_bindings',
+ 'mojo_js_unittests',
+ 'mojo_launcher',
+ 'mojo_native_viewport_service',
+ 'mojo_network_service',
+ 'mojo_pepper_container_app',
+ 'mojo_png_viewer',
+ 'mojo_profile_service',
+ 'mojo_sample_app',
+ 'mojo_shell',
+ 'mojo_shell_lib',
+ 'mojo_shell_tests',
+ 'mojo_test_service',
+ 'mojo_view_manager_lib',
+ 'mojo_view_manager_lib_unittests',
+ 'mojo_wget',
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'mojo_aura_demo',
@@ -281,33 +282,13 @@
'system/waiter_test_utils.h',
'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',
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'embedder/embedder_unittest.cc',
+ 'system/multiprocess_message_pipe_unittest.cc',
+ ],
+ }],
],
},
{
@@ -367,6 +348,14 @@
'common/test/test_utils_posix.cc',
'common/test/test_utils_win.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'common/test/multiprocess_test_helper.cc',
+ 'common/test/multiprocess_test_helper.h',
+ ],
+ }],
+ ],
},
{
'target_name': 'mojo_common_unittests',
@@ -388,6 +377,13 @@
'common/message_pump_mojo_unittest.cc',
'common/test/multiprocess_test_helper_unittest.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'common/test/multiprocess_test_helper_unittest.cc',
+ ],
+ }],
+ ],
},
{
# GN version: //mojo/environment:chromium
@@ -463,180 +459,6 @@
],
},
{
- '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_application',
- 'mojo_external_service_bindings',
- 'mojo_gles2_impl',
- 'mojo_native_viewport_service',
- 'mojo_network_bindings',
- 'mojo_profile_service',
- 'mojo_service_manager',
- 'mojo_service_provider_bindings',
- 'mojo_spy',
- 'mojo_system_impl',
- ],
- '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/mojo_url_resolver.cc',
- 'shell/mojo_url_resolver.h',
- 'shell/out_of_process_dynamic_service_runner.cc',
- 'shell/out_of_process_dynamic_service_runner.h',
- 'shell/profile_service_loader.cc',
- 'shell/profile_service_loader.h',
- 'shell/run.cc',
- 'shell/run.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/view_manager_loader.cc',
- 'shell/view_manager_loader.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_gles2',
- 'mojo_view_manager',
- 'mojo_view_manager_bindings',
- ],
- }, { # use_aura==0
- 'sources!': [
- 'shell/view_manager_loader.cc',
- 'shell/view_manager_loader.h',
- ],
- }],
- ],
- },
- {
- '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',
- ],
- 'conditions': [
- ['use_ozone==1', {
- 'dependencies': [
- '../ui/ozone/ozone.gyp:ozone',
- ],
- }],
- ],
- 'sources': [
- 'shell/desktop/mojo_main.cc',
- ],
- },
- {
- 'target_name': 'mojo_shell_tests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../testing/gtest.gyp:gtest',
- # TODO(vtl): We don't currently need this, but I imagine we will soon.
- # '../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',
- 'mojo_test_service',
- 'mojo_test_service_bindings',
- ],
- 'sources': [
- 'shell/child_process_host_unittest.cc',
- 'shell/shell_test_base.cc',
- 'shell/shell_test_base.h',
- 'shell/shell_test_base_unittest.cc',
- 'shell/shell_test_main.cc',
- ],
- 'conditions': [
- ['OS == "android"', {
- 'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ],
- },
- {
'target_name': 'mojo_service_manager_unittests',
'type': 'executable',
'dependencies': [
@@ -657,45 +479,6 @@
],
},
{
- '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/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',
'dependencies': [
@@ -710,23 +493,275 @@
'tools/message_generator.cc',
],
},
- {
- 'target_name': 'mojo_cc_support',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../cc/cc.gyp:cc',
- '../skia/skia.gyp:skia',
- '../gpu/gpu.gyp:gles2_implementation',
- 'mojo_gles2',
- ],
- 'sources': [
- 'cc/context_provider_mojo.cc',
- 'cc/context_provider_mojo.h',
- ],
- },
],
'conditions': [
+ ['OS!="ios"', {
+ 'includes': [
+ 'mojo_apps.gypi',
+ 'mojo_examples.gypi',
+ 'mojo_services.gypi',
+ ],
+ 'targets': [
+ {
+ '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_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_application',
+ 'mojo_external_service_bindings',
+ 'mojo_gles2_impl',
+ 'mojo_native_viewport_service',
+ 'mojo_network_bindings',
+ 'mojo_profile_service',
+ 'mojo_service_manager',
+ 'mojo_service_provider_bindings',
+ 'mojo_spy',
+ 'mojo_system_impl',
+ ],
+ '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/mojo_url_resolver.cc',
+ 'shell/mojo_url_resolver.h',
+ 'shell/out_of_process_dynamic_service_runner.cc',
+ 'shell/out_of_process_dynamic_service_runner.h',
+ 'shell/profile_service_loader.cc',
+ 'shell/profile_service_loader.h',
+ 'shell/run.cc',
+ 'shell/run.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/view_manager_loader.cc',
+ 'shell/view_manager_loader.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_gles2',
+ 'mojo_view_manager',
+ 'mojo_view_manager_bindings',
+ ],
+ }, { # use_aura==0
+ 'sources!': [
+ 'shell/view_manager_loader.cc',
+ 'shell/view_manager_loader.h',
+ ],
+ }],
+ ],
+ },
+ {
+ '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',
+ ],
+ 'conditions': [
+ ['use_ozone==1', {
+ 'dependencies': [
+ '../ui/ozone/ozone.gyp:ozone',
+ ],
+ }],
+ ],
+ 'sources': [
+ 'shell/desktop/mojo_main.cc',
+ ],
+ },
+ {
+ 'target_name': 'mojo_shell_tests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ # TODO(vtl): We don't currently need this, but I imagine we will
+ # soon.
+ # '../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',
+ 'mojo_test_service',
+ 'mojo_test_service_bindings',
+ ],
+ 'sources': [
+ 'shell/child_process_host_unittest.cc',
+ 'shell/shell_test_base.cc',
+ 'shell/shell_test_base.h',
+ 'shell/shell_test_base_unittest.cc',
+ 'shell/shell_test_main.cc',
+ ],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
+ },
+ {
+ '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/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_cc_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../cc/cc.gyp:cc',
+ '../skia/skia.gyp:skia',
+ '../gpu/gpu.gyp:gles2_implementation',
+ 'mojo_gles2',
+ ],
+ 'sources': [
+ 'cc/context_provider_mojo.cc',
+ 'cc/context_provider_mojo.h',
+ ],
+ },
+ ],
+ }],
['OS=="android"', {
'targets': [
{
« no previous file with comments | « content/content_app.gypi ('k') | mojo/mojo_public.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698