Revert of Mojo: Eliminate duplicate C API symbols

mojo/mojo_public.gyp

 # Copyright 2014 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.
 
 {
+  'includes': [
+    'mojo_variables.gypi',
+  ],
   'target_defaults' : {
     'include_dirs': [
       '..',
     ],
   },
   'variables': {
-    'chromium_code': 1,
     'mojo_public_test_interfaces_mojom_files': [
       'public/interfaces/bindings/tests/math_calculator.mojom',
       'public/interfaces/bindings/tests/no_module.mojom',
       'public/interfaces/bindings/tests/ping_service.mojom',
       'public/interfaces/bindings/tests/rect.mojom',
       'public/interfaces/bindings/tests/regression_tests.mojom',
       'public/interfaces/bindings/tests/sample_factory.mojom',
       'public/interfaces/bindings/tests/sample_import.mojom',
       'public/interfaces/bindings/tests/sample_import2.mojom',
       'public/interfaces/bindings/tests/sample_interfaces.mojom',
       'public/interfaces/bindings/tests/sample_service.mojom',
       'public/interfaces/bindings/tests/scoping.mojom',
       'public/interfaces/bindings/tests/serialization_test_structs.mojom',
       'public/interfaces/bindings/tests/test_constants.mojom',
       'public/interfaces/bindings/tests/test_native_types.mojom',
       'public/interfaces/bindings/tests/test_sync_methods.mojom',
     ]
   },
   'targets': [
     {
       'target_name': 'mojo_public',
       'type': 'none',
       'dependencies': [
         'mojo_js_bindings',
-        'mojo_public_system',
         'mojo_public_test_interfaces',
         'mojo_public_test_utils',
+        'mojo_system',
+      ],
+    },
+    {
+      # Targets that (a) need to obtain the settings that mojo_system passes on
+      # to its direct dependents but (b) are not themselves in a position to
+      # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g.,
+      # because they are components) should depend on this target.
+      'target_name': 'mojo_system_placeholder',
+      'type': 'none',
+    },
+    {
+      'target_name': 'mojo_system',
+      'type': 'static_library',
+      'defines': [
+        'MOJO_SYSTEM_IMPLEMENTATION',
+      ],
+      'all_dependent_settings': {
+        'conditions': [
+          # We need to be able to call the MojoSetSystemThunks() function in
+          # system_thunks.cc
+          ['OS=="android"', {
+            'ldflags!': [
+              '-Wl,--exclude-libs=ALL',
+            ],
+          }],
+        ],
+      },
+      'sources': [
+        'public/platform/native/system_thunks.cc',
+        'public/platform/native/system_thunks.h',
+      ],
+      'dependencies': [
+        'mojo_system_headers',
       ],
     },
     {
       # GN version: //mojo/public/c/system
-      'target_name': 'mojo_public_system',
-      'type': '<(component)',
+      'target_name': 'mojo_system_headers',
+      'type': 'none',
       'sources': [
         'public/c/system/buffer.h',
         'public/c/system/core.h',
         'public/c/system/data_pipe.h',
         'public/c/system/functions.h',
         'public/c/system/macros.h',
         'public/c/system/message_pipe.h',
         'public/c/system/platform_handle.h',
         'public/c/system/system_export.h',
-        'public/c/system/thunks.cc',
-        'public/c/systme/thunks.h',
         'public/c/system/types.h',
         'public/c/system/wait_set.h',
       ],
-      'defines': [
-        'MOJO_SYSTEM_IMPLEMENTATION',
-      ],
     },
     {
       # GN version: //mojo/public/cpp/system
       'target_name': 'mojo_cpp_system',
       'type': 'static_library',
       'sources': [
         'public/cpp/system/buffer.cc',
         'public/cpp/system/buffer.h',
         'public/cpp/system/core.h',
         'public/cpp/system/data_pipe.h',
         'public/cpp/system/functions.h',
         'public/cpp/system/handle.h',
         'public/cpp/system/message.h',
         'public/cpp/system/message_pipe.h',
         'public/cpp/system/platform_handle.cc',
         'public/cpp/system/platform_handle.h',
         'public/cpp/system/watcher.cc',
         'public/cpp/system/watcher.h',
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        'mojo_public_system',
+        'mojo_system_headers',
       ],
     },
     {
       # GN version: //mojo/public/cpp/bindings
       'target_name': 'mojo_cpp_bindings',
       'type': 'static_library',
       'include_dirs': [
         '..'
       ],
       'sources': [
@@ skipping 115 matching lines @@
     {
       # GN version: //mojo/message_pump
       'target_name': 'mojo_message_pump_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_MESSAGE_PUMP_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_cpp_system',
+        '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'sources': [
         'message_pump/handle_watcher.cc',
         'message_pump/handle_watcher.h',
         'message_pump/message_pump_mojo.cc',
         'message_pump/message_pump_mojo.h',
         'message_pump/message_pump_mojo_handler.h',
@@ skipping 271 matching lines @@
           },
           'sources': [
             'public/interfaces/bindings/tests/test_wtf_types.mojom',
           ],
           'includes': [ 'mojom_bindings_generator.gypi' ],
         },
       ],
     }],
   ],
 }