Split mojo_system dylib into public and private

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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'mojo_apps.gypi',
@@ skipping 12 matching lines @@
         'mojo_common_lib',
         'mojo_common_unittests',
         'mojo_js',
         'mojo_js_unittests',
         'mojo_public_perftests',
         'mojo_public_test_support',
         'mojo_public_unittests',
         'mojo_shell',
         'mojo_shell_lib',
         'mojo_system',
+        'mojo_system_impl',
         'mojo_system_unittests',
         'sample_app',
       ],
     },
     {
       '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',
       ],
       'sources': [
         'common/test/multiprocess_test_base.cc',
         'common/test/multiprocess_test_base.h',
         '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',
       ],
       'sources': [
         'common/test/run_all_perftests.cc',
       ],
     },
     {
-      'target_name': 'mojo_system',
+      'target_name': 'mojo_system_impl',
       'type': '<(component)',
       'dependencies': [
+        'mojo_system',
         '../base/base.gyp:base',
       ],
       'defines': [
-        'MOJO_SYSTEM_IMPLEMENTATION',
+        'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
       ],
       'sources': [
         'system/channel.cc',
         'system/channel.h',
-        'system/core.cc',
         'system/core_impl.cc',
         'system/core_impl.h',
         'system/dispatcher.cc',
         'system/dispatcher.h',
         'system/limits.h',
         'system/local_message_pipe_endpoint.cc',
         'system/local_message_pipe_endpoint.h',
         'system/memory.cc',
         'system/memory.h',
         'system/message_in_transit.cc',
@@ skipping 14 matching lines @@
         'system/raw_channel.h',
         'system/raw_channel_posix.cc',
         'system/raw_channel_win.cc',
         'system/simple_dispatcher.cc',
         'system/simple_dispatcher.h',
         'system/waiter.cc',
         'system/waiter.h',
         'system/waiter_list.cc',
         'system/waiter_list.h',
       ],
       'direct_dependent_settings': {

[viettrungluu, 2013/12/09 22:04:25]

Do we still need this?

[abarth-chromium, 2013/12/09 22:48:34]

Yes.  The alternative is that I could export dependent settings from
mojo_system.

         'include_dirs': [
           '..',
         ],
       },
     },
     {
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
         '../testing/gtest.gyp:gtest',
         'mojo_system',
+        'mojo_system_impl',
       ],
       'sources': [
         'system/core_impl_unittest.cc',
         'system/core_test_base.cc',
         'system/core_test_base.h',
         'system/dispatcher_unittest.cc',
         'system/message_pipe_dispatcher_unittest.cc',
         'system/message_pipe_unittest.cc',
         'system/raw_channel_posix_unittest.cc',
         'system/remote_message_pipe_posix_unittest.cc',
@@ skipping 55 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_common_lib',
         'mojo_public_test_support',
         '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_base_unittest.cc',
       ],
       'conditions': [
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
         }],
       ],
     },
     {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_system',
+        'mojo_system_impl',
         'mojo_native_viewport_service',
       ],
       'sources': [
         'shell/app_container.cc',
         'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
         'shell/init.cc',
         'shell/init.h',
         'shell/loader.cc',
@@ skipping 23 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_shell_lib',
         'mojo_system',
+        'mojo_system_impl',
       ],
       'sources': [
         'shell/desktop/mojo_main.cc',
       ],
       'conditions': [
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
@@ skipping 76 matching lines @@
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }