Make mojo_system static and mojo_system_impl a component, never use both

mojo/mojo.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 18 matching lines @@
       'type': 'none',
       'dependencies': [
         'mojo_apps_js_unittests',
         'mojo_bindings',
         'mojo_compositor_app',
         'mojo_common_lib',
         'mojo_common_unittests',
         'mojo_js',
         'mojo_js_unittests',
         'mojo_message_generator',
+        '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_service_manager',
         'mojo_service_manager_unittests',
@@ skipping 14 matching lines @@
         }],
       ]
     },
     {
       'target_name': 'mojo_run_all_unittests',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system',
         'mojo_system_impl',
         'mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
         'common/test/run_all_unittests.cc',
       ],
     },
     {
       'target_name': 'mojo_run_all_perftests',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        'mojo_system',
         'mojo_system_impl',
         'mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
         'common/test/run_all_perftests.cc',
       ],
     },
     {
       'target_name': 'mojo_system_impl',
       'type': '<(component)',
       'dependencies': [
-        'mojo_system',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'defines': [
         'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
+        'MOJO_SYSTEM_IMPLEMENTATION',
       ],
       'sources': [
         'embedder/embedder.cc',
         'embedder/embedder.h',
         'embedder/platform_channel_pair.cc',
         'embedder/platform_channel_pair.h',
         'embedder/platform_channel_pair_posix.cc',
         'embedder/platform_channel_pair_win.cc',
         'embedder/platform_channel_utils_posix.cc',
         'embedder/platform_channel_utils_posix.h',
         'embedder/platform_handle.cc',
         'embedder/platform_handle.h',
         'embedder/scoped_platform_handle.h',
         'system/channel.cc',
         'system/channel.h',
         'system/constants.h',
-        'system/core_impl.cc',
-        'system/core_impl.h',
+        'system/core.cc',
+        'system/core.h',
         'system/data_pipe.cc',
         'system/data_pipe.h',
         'system/data_pipe_consumer_dispatcher.cc',
         'system/data_pipe_consumer_dispatcher.h',
         'system/data_pipe_producer_dispatcher.cc',
         'system/data_pipe_producer_dispatcher.h',
         'system/dispatcher.cc',
         'system/dispatcher.h',
+        'system/entrypoints.cc',
         'system/handle_table.cc',
         'system/handle_table.h',
         'system/local_data_pipe.cc',
         'system/local_data_pipe.h',
         'system/local_message_pipe_endpoint.cc',
         'system/local_message_pipe_endpoint.h',
         'system/mapping_table.cc',
         'system/mapping_table.h',
         'system/memory.cc',
         'system/memory.h',
@@ skipping 30 matching lines @@
         # component as non-test-only code. In the static build, this code should
         # hopefully be dead-stripped.
         'embedder/test_embedder.cc',
         'embedder/test_embedder.h',
       ],
     },
     {
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
+        '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
         '../testing/gtest.gyp:gtest',
         'mojo_common_test_support',
-        'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
         'embedder/embedder_unittest.cc',
         'embedder/platform_channel_pair_posix_unittest.cc',
-        'system/core_impl_unittest.cc',
+        'system/core_unittest.cc',
         'system/core_test_base.cc',
         'system/core_test_base.h',
         'system/data_pipe_unittest.cc',
         'system/dispatcher_unittest.cc',
         'system/local_data_pipe_unittest.cc',
         'system/message_pipe_dispatcher_unittest.cc',
         'system/message_pipe_unittest.cc',
         'system/multiprocess_message_pipe_unittest.cc',
         'system/raw_channel_unittest.cc',
         'system/raw_shared_buffer_unittest.cc',
@@ skipping 14 matching lines @@
       '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',
@@ skipping 14 matching lines @@
     },
     {
       'target_name': 'mojo_common_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_COMMON_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_system',
+        'mojo_system_impl',
+      ],
+      'export_dependent_settings': [
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        'mojo_system_impl',
       ],
       'sources': [
         'common/common_type_converters.cc',
         'common/common_type_converters.h',
         'common/environment_data.cc',
         'common/environment_data.h',
         'common/handle_watcher.cc',
         'common/handle_watcher.h',
         'common/message_pump_mojo.cc',
         'common/message_pump_mojo.h',
         'common/message_pump_mojo_handler.h',
         'common/time_helper.cc',
         'common/time_helper.h',
       ],
     },
     {
       'target_name': 'mojo_common_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
         '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',
       ],
     },
     {
       'target_name': 'mojo_common_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_environment_chromium',
         'mojo_common_lib',
         'mojo_common_test_support',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
-        'mojo_system_impl',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
         'common/handle_watcher_unittest.cc',
         'common/message_pump_mojo_unittest.cc',
         'common/test/multiprocess_test_helper_unittest.cc',
       ],
     },
     {
       'target_name': 'mojo_environment_chromium',
@@ skipping 42 matching lines @@
         'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_shell_bindings',
+        'mojo_system_impl',
       ],
       'sources': [
         'service_manager/service_loader.h',
         'service_manager/service_manager.cc',
         'service_manager/service_manager.h',
         'service_manager/service_manager_export.h',
       ],
       'export_dependent_settings': [
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_shell_bindings',
@@ skipping 17 matching lines @@
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_gles2_impl',
         'mojo_service_manager',
         'mojo_shell_bindings',
-        'mojo_system',
         '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',
@@ skipping 40 matching lines @@
       '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',
         'mojo_system_impl',
       ],
       'sources': [
         'shell/desktop/mojo_main.cc',
       ],
     },
     {
       'target_name': 'mojo_service_manager_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_run_all_unittests',
         'mojo_service_manager',
         'mojo_shell_client',
-        'mojo_system',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'service_manager/service_manager_unittest.cc',
         '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',
-        'mojo_system',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../gin/gin.gyp:gin',
         'mojo_common_lib',
-        'mojo_system',
       ],
       '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',
@@ skipping 14 matching lines @@
     },
     {
       'target_name': 'mojo_message_generator',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
         'tools/message_generator.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
@@ skipping 87 matching lines @@
             'mojo_js_unittests.isolate',
           ],
           'sources': [
             'mojo_js_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }