Stop linking in the old Mojo EDK.

mojo/mojo_edk_tests.gyp

Index: mojo/mojo_edk_tests.gyp
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp
index 74c7871a4e461bd2b8839434c69f1e0a12695bc7..f34ac8d32eb6a0fe825d750744895b5c842de7e4 100644
--- a/mojo/mojo_edk_tests.gyp
+++ b/mojo/mojo_edk_tests.gyp
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
-  ],
+  'variables': {
+    'chromium_code': 1,
+  },
   'targets': [
     {
       'target_name': 'mojo_edk_tests',
@@ -16,21 +16,30 @@
         # 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.
-        'mojo_message_pipe_perftests2',
-        'mojo_system_unittests2',
+        'mojo_message_pipe_perftests',
+        'mojo_system_unittests',
         'mojo_js_unittests',
         'mojo_js_integration_tests',
+        # TODO(jam): temporarly so that the targets there are reachable from
+        # all.gyp, until they're moved here.
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_perftests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
       ],
     },
     {
       # GN version: //mojo/edk/system:mojo_system_unittests
-      'target_name': 'mojo_system_unittests2',
+      'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_system_impl2',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
         'edk/embedder/embedder_unittest.cc',
@@ -52,7 +61,6 @@
         'edk/system/options_validation_unittest.cc',
         'edk/system/platform_handle_dispatcher_unittest.cc',
         'edk/system/raw_channel_unittest.cc',
-        'edk/system/run_all_unittests.cc',
         'edk/system/shared_buffer_dispatcher_unittest.cc',
         'edk/system/simple_dispatcher_unittest.cc',
         'edk/system/test_utils.cc',
@@ -75,15 +83,15 @@
     },
     {
       # GN version: //mojo/edk/system:mojo_message_pipe_perftests
-      'target_name': 'mojo_message_pipe_perftests2',
+      'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:test_support_perf',
         '../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_system_impl2',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
         'edk/system/message_pipe_perftest.cc',
@@ -103,9 +111,9 @@
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
         '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
         '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_run_all_unittests2',
-        'mojo_edk.gyp:mojo_js_lib2',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_edk.gyp:mojo_js_lib',
       ],
       'sources': [
         'edk/js/handle_unittest.cc',
@@ -122,8 +130,9 @@
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
         '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
         '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        'mojo_edk.gyp:mojo_js_lib2',
-        'mojo_edk.gyp:mojo_run_all_unittests2',
+        'mojo_base.gyp:mojo_common_lib',
+        'mojo_edk.gyp:mojo_js_lib',
+        'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_js_to_cpp_bindings',
       ],
       'sources': [
@@ -131,5 +140,15 @@
         'edk/js/tests/js_to_cpp_tests.cc',
       ],
     },
+    {
+      'target_name': 'mojo_js_to_cpp_bindings',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'edk/js/tests/js_to_cpp.mojom',
+        ],
+      },
+      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
+    },
   ],
 }