Make mojo_system static and mojo_system_impl a component, never use both

mojo/mojo_public.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_system',
-      'type': '<(component)',
+      'type': 'static_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'sources': [
         'public/c/system/async_waiter.h',
         'public/c/system/core.h',
         'public/c/system/macros.h',
         'public/c/system/system_export.h',
-        'public/system/core_private.cc',
-        'public/system/core_private.h',
+        'public/platform/native/system_thunks.cc',
+        'public/platform/native/system_thunks.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
             # Make it a run-path dependent library.
             'DYLIB_INSTALL_NAME_BASE': '@rpath',
           },
           'direct_dependent_settings': {
             'xcode_settings': {
               # Look for run-path dependent libraries in the loader's directory.
@@ skipping 79 matching lines @@
           },
         }],
       ],
     },
     {
       'target_name': 'mojo_public_test_utils',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system',
         'mojo_test_support',
       ],
       'sources': [
         'public/cpp/test_support/lib/test_utils.cc',
         'public/cpp/test_support/test_utils.h',
       ],
     },
     # TODO(vtl): Reorganize the mojo_public_*_unittests.
     {
       'target_name': 'mojo_public_bindings_unittests',
       'type': 'executable',
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_environment_standalone',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
         'mojo_sample_service',
-        'mojo_system',
+        'mojo_system_impl',

[viettrungluu, 2014/04/10 19:38:06]

Can we pick up this dependency via mojo_run_all_unittests, rather than listing
it here?

         'mojo_utility',
       ],
       'sources': [
         'public/cpp/bindings/tests/array_unittest.cc',
         'public/cpp/bindings/tests/buffer_unittest.cc',
         'public/cpp/bindings/tests/connector_unittest.cc',
         'public/cpp/bindings/tests/handle_passing_unittest.cc',
         'public/cpp/bindings/tests/remote_ptr_unittest.cc',
         'public/cpp/bindings/tests/request_response_unittest.cc',
         'public/cpp/bindings/tests/router_unittest.cc',
@@ skipping 11 matching lines @@
     },
     {
       'target_name': 'mojo_public_environment_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_environment_standalone',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'public/cpp/environment/tests/async_waiter_unittest.cc',
       ],
     },
     {
       'target_name': 'mojo_public_system_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
+        'mojo_system_impl',

[viettrungluu, 2014/04/10 19:38:06]

"

       ],
       'sources': [
         'public/c/system/tests/core_unittest.cc',
         'public/c/system/tests/core_unittest_pure_c.c',
         'public/c/system/tests/macros_unittest.cc',
         'public/cpp/system/tests/core_unittest.cc',
         'public/cpp/system/tests/macros_unittest.cc',
       ],
     },
     {
       'target_name': 'mojo_public_utility_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'public/cpp/utility/tests/mutex_unittest.cc',
         'public/cpp/utility/tests/run_loop_unittest.cc',
         'public/cpp/utility/tests/thread_unittest.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
             'public/cpp/utility/tests/mutex_unittest.cc',
             'public/cpp/utility/tests/thread_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_public_test_utils',
         'mojo_run_all_perftests',
-        'mojo_system',

[viettrungluu, 2014/04/10 19:38:06]

(I suspect yes, if the perftests build without the system_impl dependency.)

         'mojo_utility',
       ],
       'sources': [
         'public/c/system/tests/core_perftest.cc',
       ],
     },
     {
       'target_name': 'mojo_bindings',
       'type': 'static_library',
       'include_dirs': [
@@ skipping 48 matching lines @@
         'public/interfaces/bindings/tests/sample_service.mojom',
         'public/interfaces/bindings/tests/sample_import.mojom',
         'public/interfaces/bindings/tests/sample_import2.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
     },
     {
       'target_name': 'mojo_environment_standalone',
       'type': 'static_library',
       'sources': [
         'public/cpp/environment/buffer_tls.h',
         'public/cpp/environment/default_async_waiter.h',
         'public/cpp/environment/environment.h',
         'public/cpp/environment/lib/default_async_waiter.cc',
@@ skipping 40 matching lines @@
       'type': 'static_library',
       'sources': [
         'public/interfaces/shell/shell.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'export_dependent_settings': [
         'mojo_bindings',
       ],
     },
     {
       'target_name': 'mojo_shell_client',
       'type': 'static_library',
       'sources': [
         'public/cpp/shell/application.h',
         'public/cpp/shell/service.h',
         'public/cpp/shell/lib/application.cc',
         'public/cpp/shell/lib/service.cc',
       ],
       'dependencies': [
         'mojo_shell_bindings',
       ],
       'export_dependent_settings': [
         'mojo_shell_bindings',
       ],
     },
   ],
 }