Make mojo_system static and mojo_system_impl a component, never use both

mojo/mojo_public.gypi

Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 261170a9822d2bb461de9e11eb3423e132bbf66e..15eccb0c7e9bdc6f0164625a13a5a1392dcc40d4 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -2,7 +2,7 @@
   'targets': [
     {
       'target_name': 'mojo_system',
-      'type': '<(component)',
+      'type': 'static_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
@@ -19,22 +19,8 @@
         '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',
-      ],
-      '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.
-              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
-            },
-          },
-        }],
+        'public/platform/native/system_thunks.cc',
+        'public/platform/native/system_thunks.h',
       ],
     },
     {
@@ -68,13 +54,7 @@
         ['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.
-              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
-            },
+            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
           },
         }],
       ],
@@ -103,13 +83,7 @@
         ['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.
-              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
-            },
+            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
           },
         }],
       ],
@@ -120,7 +94,6 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system',
         'mojo_test_support',
       ],
       'sources': [
@@ -139,7 +112,6 @@
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
         'mojo_sample_service',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -171,7 +143,6 @@
         'mojo_environment_standalone',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -187,7 +158,6 @@
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
       ],
       'sources': [
         'public/c/system/tests/core_unittest.cc',
@@ -206,7 +176,6 @@
         'mojo_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -232,7 +201,6 @@
         '../testing/gtest.gyp:gtest',
         'mojo_public_test_utils',
         'mojo_run_all_perftests',
-        'mojo_system',
         'mojo_utility',
       ],
       'sources': [
@@ -301,11 +269,9 @@
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
     },
     {
@@ -366,7 +332,6 @@
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_bindings',
-        'mojo_system',
       ],
       'export_dependent_settings': [
         'mojo_bindings',