Stop linking in the old Mojo EDK.

third_party/mojo/mojo_variables.gypi

Index: third_party/mojo/mojo_variables.gypi
diff --git a/third_party/mojo/mojo_variables.gypi b/third_party/mojo/mojo_variables.gypi
index f76ad6d20d111a4610ed183507be634e9d8cfae6..e4ff5593f492bd18dbb89f04cd69abdd7af307b7 100644
--- a/third_party/mojo/mojo_variables.gypi
+++ b/third_party/mojo/mojo_variables.gypi
@@ -9,38 +9,6 @@
   'variables': {
     'chromium_code': 1,
     'mojo_shell_debug_url%': "",
-    '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_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl",
-        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
-        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
-      }, {
-        'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
-        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system_placeholder",
-        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system",
-      }],
-    ],
     'mojo_public_system_unittest_sources': [
       '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc',
       '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c',