Move //mojo/{public, edk} underneath //third_party

mojo/mojo_edk.gyp

Index: mojo/mojo_edk.gyp
diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp
deleted file mode 100644
index 68b2affd914528dfd4d14f24e276efe0bfc89e17..0000000000000000000000000000000000000000
--- a/mojo/mojo_edk.gyp
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'mojo_variables.gypi',
-  ],
-  'targets': [
-    {
-      # GN version: //mojo/edk/system
-      'target_name': 'mojo_system_impl',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      ],
-      'includes': [
-        'mojo_edk_system_impl.gypi',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/js
-      'target_name': 'mojo_js_lib',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
-        '../v8/tools/gyp/v8.gyp:v8',
-      ],
-      'export_dependent_settings': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
-      ],
-      'sources': [
-        # Sources list duplicated in GN build.
-        'edk/js/core.cc',
-        'edk/js/core.h',
-        'edk/js/drain_data.cc',
-        'edk/js/drain_data.h',
-        'edk/js/handle.cc',
-        'edk/js/handle.h',
-        'edk/js/handle_close_observer.h',
-        'edk/js/mojo_runner_delegate.cc',
-        'edk/js/mojo_runner_delegate.h',
-        'edk/js/support.cc',
-        'edk/js/support.h',
-        'edk/js/threading.cc',
-        'edk/js/threading.h',
-        'edk/js/waiting_callback.cc',
-        'edk/js/waiting_callback.h',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/test:test_support_impl
-      'target_name': 'mojo_test_support_impl',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'edk/test/test_support_impl.cc',
-        'edk/test/test_support_impl.h',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/test:test_support
-      '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_impl',
-      ],
-      'sources': [
-        'edk/test/multiprocess_test_helper.cc',
-        'edk/test/multiprocess_test_helper.h',
-        'edk/test/test_utils.h',
-        '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
-      'target_name': 'mojo_run_all_unittests',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
-        'mojo_system_impl',
-        'mojo_public.gyp:mojo_test_support',
-        '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',
-        'mojo_edk.gyp:mojo_system_impl',
-        'mojo_public.gyp:mojo_test_support',
-        'mojo_test_support_impl',
-      ],
-      'sources': [
-        'edk/test/run_all_perftests.cc',
-      ],
-    },
-  ],
-  'conditions': [
-    ['OS=="win" and target_arch=="ia32"', {
-      'targets': [
-        {
-          'target_name': 'mojo_system_impl_win64',
-          'type': '<(component)',
-          'dependencies': [
-            '../base/base.gyp:base_win64',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
-          ],
-          'includes': [
-            'mojo_edk_system_impl.gypi',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-        },
-      ],
-    }],
-  ],
-}