Stop linking in the old Mojo EDK.

mojo/mojo_edk.gyp

Index: mojo/mojo_edk.gyp
diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp
index 5d265a68a59900370e0309076c3394f9bb9ac1e0..90ebfe372662e0e6427e78d1268cedbd4420c9a3 100644
--- a/mojo/mojo_edk.gyp
+++ b/mojo/mojo_edk.gyp
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
-  ],
+  'variables': {
+    'chromium_code': 1,
+  },
   'target_defaults' : {
     'include_dirs': [
       '..',
@@ -18,13 +18,8 @@
   },
   'targets': [
     {
-      # GN version: //mojo/edk/system
-      'target_name': 'mojo_system_impl2',
-      'type': 'static_library',
-      # TODO(use_chrome_edk): this should be a component to match third_party,
-      # but since third_party includes it, we either make it a static library
-      # or we have to change the export macros to be different than third_party.
-      #'type': '<(component)',
+      'target_name': 'mojo_system_impl',
+      'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -143,8 +138,7 @@
     },
     {
       # GN version: //mojo/edk/js
-      # TODO(use_chrome_edk): remove "2"
-      'target_name': 'mojo_js_lib2',
+      'target_name': 'mojo_js_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -176,8 +170,7 @@
     },
     {
       # GN version: //mojo/edk/test:test_support_impl
-      # TODO(use_chrome_edk): remove "2"
-      'target_name': 'mojo_test_support_impl2',
+      'target_name': 'mojo_test_support_impl',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -189,13 +182,13 @@
     },
     {
       # GN version: //mojo/edk/test:test_support
-      'target_name': 'mojo_common_test_support2',
+      'target_name': 'mojo_common_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
-        'mojo_system_impl2',
+        'mojo_system_impl',
       ],
       'sources': [
         'edk/test/multiprocess_test_helper.cc',
@@ -206,30 +199,39 @@
         'edk/test/test_utils_posix.cc',
         'edk/test/test_utils_win.cc',
       ],
-      'conditions': [
-        ['OS=="ios"', {
-          'sources!': [
-            'edk/test/multiprocess_test_helper.cc',
-          ],
-        }],
-      ],
     },
     {
       # GN version: //mojo/edk/test:run_all_unittests
-      # TODO(use_chrome_edk): remove "2"
-      'target_name': 'mojo_run_all_unittests2',
+      'target_name': 'mojo_run_all_unittests',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../third_party/mojo/mojo_public.gyp:mojo_public_test_support',
-        'mojo_system_impl2',
-        'mojo_test_support_impl2',
+        'mojo_common_test_support',
+        'mojo_system_impl',
+        'mojo_test_support_impl',
       ],
       'sources': [
         'edk/test/run_all_unittests.cc',
       ],
     },
+    {
+      # GN version: //mojo/edk/test:run_all_perftests
+      'target_name': 'mojo_run_all_perftests',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_public.gyp:mojo_public_test_support',
+        'mojo_edk.gyp:mojo_system_impl',
+        'mojo_common_test_support',
+        'mojo_test_support_impl',
+      ],
+      'sources': [
+        'edk/test/run_all_perftests.cc',
+      ],
+    },
   ],
 }