Revert of Mojo: Eliminate duplicate C API symbols

mojo/mojo_edk_tests.gyp

 # Copyright 2015 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_variables.gypi',
+  ],
   'targets': [
     {
       'target_name': 'mojo_edk_tests',
       'type': 'none',
       'dependencies': [
         # NOTE: If adding a new dependency here, please consider whether it
         # should also be added to the list of Mojo-related dependencies of
         # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
         # target on iOS due to the presence of the js targets, which cause v8
         # to be built.
@@ skipping 143 matching lines @@
       # and         //mojo/public/c/system/tests
       'target_name': 'mojo_public_system_unittests',
       'type': 'executable',
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_cpp_system',
         'mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
-        '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc',
-        '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c',
-        '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc',
-        '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc',
-        '<(DEPTH)/mojo/public/cpp/system/tests/watcher_unittest.cc',
+        '<@(mojo_public_system_unittest_sources)',
       ],
     },
     {
       # GN version: //mojo/edk/test:mojo_public_system_perftests
       'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_perftests',
-        'mojo_public.gyp:mojo_public_system',
         'mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
         'public/c/system/tests/core_perftest.cc',
       ],
     },
     {
       # GN version: //mojo/edk/system:mojo_system_unittests
       'target_name': 'mojo_system_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_edk.gyp:mojo_system_impl',
         'mojo_edk.gyp:mojo_system_ports',
-        'mojo_public.gyp:mojo_public_system',
       ],
       'sources': [
         'edk/embedder/embedder_unittest.cc',
         'edk/embedder/platform_channel_pair_posix_unittest.cc',
         'edk/embedder/platform_shared_buffer_unittest.cc',
         'edk/system/awakable_list_unittest.cc',
         'edk/system/core_test_base.cc',
         'edk/system/core_test_base.h',
         'edk/system/core_unittest.cc',
         'edk/system/message_pipe_unittest.cc',
@@ skipping 29 matching lines @@
       # GN version: //mojo/edk/system:mojo_message_pipe_perftests
       'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_run_all_perftests',
         'mojo_edk.gyp:mojo_system_impl',
-        'mojo_public.gyp:mojo_public_system',
       ],
       'sources': [
         'edk/system/message_pipe_perftest.cc',
         'edk/system/test_utils.cc',
         'edk/system/test_utils.h',
       ],
     },
     # TODO(yzshen): fix the following two targets.
     {
       # GN version: //mojo/edk/js/test:js_unittests
@@ skipping 120 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'mojo_system_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }