Stop linking in the old Mojo EDK.

mojo/mojo_base.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.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
-  'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
-  ],
+  'variables': {
+    'chromium_code': 1,
+    'conditions': [
+      #
+      # The following mojo_system-prefixed variables are used to express a
+      # dependency on the mojo system APIs.
+      #
+      # In a component == "shared_library" build, everything can link against
+      # mojo_system_impl because it is built as a shared library. However, in a
+      # component != "shared_library" build, mojo_system_impl is linked into an
+      # executable (e.g., mojo_shell), and must be injected into other shared
+      # libraries (i.e., Mojo Apps) that need the mojo system API.
+      #
+      # For component targets, add <(mojo_system_for_component) to your
+      # dependencies section.  For loadable module targets (e.g., a Mojo App),
+      # add <(mojo_system_for_loadable_module) to your dependencies section.
+      #
+      # NOTE: component != "shared_library" implies that we are generating a
+      # static library, and in that case, it is expected that the target
+      # listing the component as a dependency will specify either mojo_system
+      # or mojo_system_impl to link against. This enables multiple targets to
+      # link against the same component library without having to agree on
+      # which Mojo system library they are using.
+      #
+      ['component=="shared_library"', {
+        'mojo_system_for_component': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",
+      }, {
+        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system_placeholder",
+      }],
+    ],
+  },
   'targets': [
     {
       'target_name': 'mojo_base',
       '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 101 matching lines @@
     {
       # GN version: //mojo/common:mojo_common_unittests
       'target_name': 'mojo_common_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
-        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
-        '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
         'mojo_common_lib',
+        'mojo_edk.gyp:mojo_system_impl',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_environment_chromium',
         'mojo_message_pump_lib',
         'mojo_url_type_converters',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
         'message_pump/handle_watcher_unittest.cc',
         'message_pump/message_pump_mojo_unittest.cc',
       ],
     },
@@ skipping 130 matching lines @@
         'test/test_utils_posix.cc',
         'test/test_utils_win.cc',
       ],
     },
     {
       # GN version: //mojo/shell/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
         'mojo_application_base',
+        'mojo_edk.gyp:mojo_run_all_unittests',
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
         '../third_party/mojo/mojo_public.gyp:mojo_utility',
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
         'shell/public/cpp/tests/service_registry_unittest.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
@@ skipping 14 matching lines @@
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libmojo_system_java',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'mojo_common_lib',
-            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            'mojo_edk.gyp:mojo_system_impl',
             'mojo_environment_chromium',
             'mojo_jni_headers',
           ],
           'sources': [
             'android/system/core_impl.cc',
             'android/system/core_impl.h',
           ],
         },
         {
           'target_name': 'mojo_java_set_jni_headers',
@@ skipping 31 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'mojo_common_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }