[gyp] move gyp files from src to gypfiles.

Bug: v8:7341
Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I90879be3a94745859b7da7c9bb9b6533af11cc2d
Reviewed-on: https://chromium-review.googlesource.com/878221Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50790}

Makefile

@@ -278,14 +278,10 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
            gypfiles/standalone.gypi \
 	   gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
 	   test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
-	   test/unittests/unittests.gyp src/v8.gyp \
+	   test/unittests/unittests.gyp gypfiles/v8.gyp \
 	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
-	   samples/samples.gyp src/third_party/vtune/v8vtune.gyp src/d8.gyp
+	   gypfiles/samples.gyp gypfiles/v8vtune.gyp gypfiles/d8.gyp
 
-# If vtunejit=on, the v8vtune.gyp will be appended.
-ifeq ($(vtunejit), on)
-  GYPFILES += src/third_party/vtune/v8vtune.gyp
-endif
 # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
 BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
 ANDROID_BUILDS = $(foreach mode,$(MODES), \

PRESUBMIT.py

@@ -239,8 +239,8 @@ def _CheckMissingFiles(input_api, output_api):
   # eval-ed and thus doesn't have __file__.
   original_sys_path = sys.path
   try:
-    sys.path = sys.path + [input_api.os_path.join(
-        input_api.PresubmitLocalPath(), 'tools')]
+    sys.path = [input_api.os_path.join(input_api.PresubmitLocalPath(),
+                                       'gypfiles')] + sys.path
     from verify_source_deps import missing_gn_files, missing_gyp_files
   finally:
     # Restore sys.path to what it was before.
@@ -249,6 +249,7 @@ def _CheckMissingFiles(input_api, output_api):
   gn_files = missing_gn_files()
   gyp_files = missing_gyp_files()
   results = []
+
   if gn_files:
     results.append(output_api.PresubmitError(
         "You added one or more source files but didn't update the\n"
@@ -266,8 +267,6 @@ def _CommonChecks(input_api, output_api):
   """Checks common to both upload and commit."""
   results = []
   results.extend(_CheckCommitMessageBugEntry(input_api, output_api))
-  results.extend(input_api.canned_checks.CheckOwners(
-      input_api, output_api, source_file_filter=None))
   results.extend(input_api.canned_checks.CheckPatchFormatted(
       input_api, output_api))
   results.extend(input_api.canned_checks.CheckGenderNeutral(

gypfiles/all.gyp

@@ -8,7 +8,7 @@
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
-        '../src/d8.gyp:d8',
+        '../gypfiles/d8.gyp:d8',
         '../test/inspector/inspector.gyp:*',
         '../test/mkgrokdump/mkgrokdump.gyp:*',
       ],
@@ -21,7 +21,7 @@
         # These items don't compile for Android on Mac.
         ['host_os!="mac" or OS!="android"', {
           'dependencies': [
-            '../samples/samples.gyp:*',
+            'samples.gyp:*',
             '../test/cctest/cctest.gyp:*',
             '../test/fuzzer/fuzzer.gyp:*',
             '../test/unittests/unittests.gyp:*',

src/d8.gyp → gypfiles/d8.gyp

-# Copyright 2012 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Copyright 2018 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 {
   'variables': {
@@ -32,7 +9,7 @@
     'v8_enable_vtunejit%': 0,
     'v8_enable_i18n_support%': 1,
   },
-  'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'],
+  'includes': ['toolchain.gypi', 'features.gypi'],
   'targets': [
     {
       'target_name': 'd8',
@@ -48,10 +25,10 @@
         '<(DEPTH)',
       ],
       'sources': [
-        'd8.h',
-        'd8.cc',
-        'd8-console.h',
-        'd8-console.cc',
+        '../src/d8.h',
+        '../src/d8.cc',
+        '../src/d8-console.h',
+        '../src/d8-console.cc',
         '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
       ],
       'conditions': [
@@ -68,10 +45,10 @@
         ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
            or OS=="openbsd" or OS=="solaris" or OS=="android" \
            or OS=="qnx" or OS=="aix")', {
-             'sources': [ 'd8-posix.cc', ]
+             'sources': [ '../src/d8-posix.cc', ]
            }],
         [ 'OS=="win"', {
-          'sources': [ 'd8-windows.cc', ]
+          'sources': [ '../src/d8-windows.cc', ]
         }],
         [ 'component!="shared_library"', {
           'conditions': [
@@ -86,7 +63,7 @@
         }],
         ['v8_enable_vtunejit==1', {
           'dependencies': [
-            '../src/third_party/vtune/v8vtune.gyp:v8_vtune',
+            'v8vtune.gyp:v8_vtune',
           ],
         }],
         ['v8_enable_i18n_support==1', {
@@ -107,8 +84,8 @@
       'type': 'none',
       'variables': {
         'js_files': [
-          'd8.js',
-          'js/macros.py',
+          '../src/d8.js',
+          '../src/js/macros.py',
         ],
       },
       'conditions': [
@@ -149,10 +126,10 @@
             'd8',
           ],
           'includes': [
-            '../gypfiles/isolate.gypi',
+            'isolate.gypi',
           ],
           'sources': [
-            'd8.isolate',
+            '../src/d8.isolate',
           ],
         },
       ],

src/inspector/inspector.gyp → gypfiles/inspector.gyp

@@ -4,11 +4,12 @@
 
 {
   'variables': {
-    'protocol_path': '../../third_party/inspector_protocol',
+    'protocol_path': '../third_party/inspector_protocol',
+    'inspector_path': '../src/inspector',
   },
   'includes': [
     'inspector.gypi',
-    '<(PRODUCT_DIR)/../../../third_party/inspector_protocol/inspector_protocol.gypi',
+    '../third_party/inspector_protocol/inspector_protocol.gypi',
   ],
   'targets': [
     { 'target_name': 'inspector_injected_script',
@@ -18,7 +19,7 @@
         {
           'action_name': 'convert_js_to_cpp_char_array',
           'inputs': [
-            'build/xxd.py',
+            '<(inspector_path)/build/xxd.py',
             '<(inspector_injected_script_source)',
           ],
           'outputs': [
@@ -26,9 +27,9 @@
           ],
           'action': [
             'python',
-            'build/xxd.py',
+            '<(inspector_path)/build/xxd.py',
             'InjectedScriptSource_js',
-            'injected-script-source.js',
+            '<(inspector_path)/injected-script-source.js',
             '<@(_outputs)'
           ],
         },
@@ -43,7 +44,7 @@
         {
           'action_name': 'protocol_compatibility',
           'inputs': [
-            'js_protocol.json',
+            '<(inspector_path)/js_protocol.json',
           ],
           'outputs': [
             '<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp',
@@ -52,7 +53,7 @@
             'python',
             '<(protocol_path)/CheckProtocolCompatibility.py',
             '--stamp', '<@(_outputs)',
-            'js_protocol.json',
+            '<(inspector_path)/js_protocol.json',
           ],
           'message': 'Generating inspector protocol sources from protocol json definition',
         },
@@ -66,8 +67,8 @@
         {
           'action_name': 'protocol_generated_sources',
           'inputs': [
-            'js_protocol.json',
-            'inspector_protocol_config.json',
+            '<(inspector_path)/js_protocol.json',
+            '<(inspector_path)/inspector_protocol_config.json',
             '<@(inspector_protocol_files)',
           ],
           'outputs': [
@@ -76,9 +77,9 @@
           'action': [
             'python',
             '<(protocol_path)/CodeGenerator.py',
-            '--jinja_dir', '../../third_party',
+            '--jinja_dir', '../third_party',
             '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector',
-            '--config', 'inspector_protocol_config.json',
+            '--config', '<(inspector_path)/inspector_protocol_config.json',
           ],
           'message': 'Generating inspector protocol sources from protocol json',
         },

src/inspector/inspector.gypi → gypfiles/inspector.gypi

@@ -25,7 +25,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h',
     ],
 
-    'inspector_injected_script_source': 'injected-script-source.js',
+    'inspector_injected_script_source': '../src/inspector/injected-script-source.js',
     'inspector_generated_injected_script': '<(SHARED_INTERMEDIATE_DIR)/src/inspector/injected-script-source.h',
 
     'inspector_all_sources': [
@@ -33,58 +33,58 @@
       '<(inspector_generated_injected_script)',
       '../include/v8-inspector.h',
       '../include/v8-inspector-protocol.h',
-      'inspector/injected-script.cc',
-      'inspector/injected-script.h',
-      'inspector/inspected-context.cc',
-      'inspector/inspected-context.h',
-      'inspector/remote-object-id.cc',
-      'inspector/remote-object-id.h',
-      'inspector/search-util.cc',
-      'inspector/search-util.h',
-      'inspector/string-16.cc',
-      'inspector/string-16.h',
-      'inspector/string-util.cc',
-      'inspector/string-util.h',
-      'inspector/test-interface.cc',
-      'inspector/test-interface.h',
-      'inspector/v8-console.cc',
-      'inspector/v8-console.h',
-      'inspector/v8-console-agent-impl.cc',
-      'inspector/v8-console-agent-impl.h',
-      'inspector/v8-console-message.cc',
-      'inspector/v8-console-message.h',
-      'inspector/v8-debugger.cc',
-      'inspector/v8-debugger.h',
-      'inspector/v8-debugger-agent-impl.cc',
-      'inspector/v8-debugger-agent-impl.h',
-      'inspector/v8-debugger-script.cc',
-      'inspector/v8-debugger-script.h',
-      'inspector/v8-function-call.cc',
-      'inspector/v8-function-call.h',
-      'inspector/v8-heap-profiler-agent-impl.cc',
-      'inspector/v8-heap-profiler-agent-impl.h',
-      'inspector/v8-injected-script-host.cc',
-      'inspector/v8-injected-script-host.h',
-      'inspector/v8-inspector-impl.cc',
-      'inspector/v8-inspector-impl.h',
-      'inspector/v8-inspector-session-impl.cc',
-      'inspector/v8-inspector-session-impl.h',
-      'inspector/v8-internal-value-type.cc',
-      'inspector/v8-internal-value-type.h',
-      'inspector/v8-profiler-agent-impl.cc',
-      'inspector/v8-profiler-agent-impl.h',
-      'inspector/v8-regex.cc',
-      'inspector/v8-regex.h',
-      'inspector/v8-runtime-agent-impl.cc',
-      'inspector/v8-runtime-agent-impl.h',
-      'inspector/v8-schema-agent-impl.cc',
-      'inspector/v8-schema-agent-impl.h',
-      'inspector/v8-stack-trace-impl.cc',
-      'inspector/v8-stack-trace-impl.h',
-      'inspector/v8-value-utils.cc',
-      'inspector/v8-value-utils.h',
-      'inspector/wasm-translation.cc',
-      'inspector/wasm-translation.h',
+      '../src/inspector/injected-script.cc',
+      '../src/inspector/injected-script.h',
+      '../src/inspector/inspected-context.cc',
+      '../src/inspector/inspected-context.h',
+      '../src/inspector/remote-object-id.cc',
+      '../src/inspector/remote-object-id.h',
+      '../src/inspector/search-util.cc',
+      '../src/inspector/search-util.h',
+      '../src/inspector/string-16.cc',
+      '../src/inspector/string-16.h',
+      '../src/inspector/string-util.cc',
+      '../src/inspector/string-util.h',
+      '../src/inspector/test-interface.cc',
+      '../src/inspector/test-interface.h',
+      '../src/inspector/v8-console.cc',
+      '../src/inspector/v8-console.h',
+      '../src/inspector/v8-console-agent-impl.cc',
+      '../src/inspector/v8-console-agent-impl.h',
+      '../src/inspector/v8-console-message.cc',
+      '../src/inspector/v8-console-message.h',
+      '../src/inspector/v8-debugger.cc',
+      '../src/inspector/v8-debugger.h',
+      '../src/inspector/v8-debugger-agent-impl.cc',
+      '../src/inspector/v8-debugger-agent-impl.h',
+      '../src/inspector/v8-debugger-script.cc',
+      '../src/inspector/v8-debugger-script.h',
+      '../src/inspector/v8-function-call.cc',
+      '../src/inspector/v8-function-call.h',
+      '../src/inspector/v8-heap-profiler-agent-impl.cc',
+      '../src/inspector/v8-heap-profiler-agent-impl.h',
+      '../src/inspector/v8-injected-script-host.cc',
+      '../src/inspector/v8-injected-script-host.h',
+      '../src/inspector/v8-inspector-impl.cc',
+      '../src/inspector/v8-inspector-impl.h',
+      '../src/inspector/v8-inspector-session-impl.cc',
+      '../src/inspector/v8-inspector-session-impl.h',
+      '../src/inspector/v8-internal-value-type.cc',
+      '../src/inspector/v8-internal-value-type.h',
+      '../src/inspector/v8-profiler-agent-impl.cc',
+      '../src/inspector/v8-profiler-agent-impl.h',
+      '../src/inspector/v8-regex.cc',
+      '../src/inspector/v8-regex.h',
+      '../src/inspector/v8-runtime-agent-impl.cc',
+      '../src/inspector/v8-runtime-agent-impl.h',
+      '../src/inspector/v8-schema-agent-impl.cc',
+      '../src/inspector/v8-schema-agent-impl.h',
+      '../src/inspector/v8-stack-trace-impl.cc',
+      '../src/inspector/v8-stack-trace-impl.h',
+      '../src/inspector/v8-value-utils.cc',
+      '../src/inspector/v8-value-utils.h',
+      '../src/inspector/wasm-translation.cc',
+      '../src/inspector/wasm-translation.h',
     ]
   }
 }

samples/samples.gyp → gypfiles/samples.gyp

 # Copyright 2012 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 {
   'variables': {
@@ -31,13 +8,13 @@
     'v8_enable_i18n_support%': 1,
     'v8_toolset_for_shell%': 'target',
   },
-  'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'],
+  'includes': ['toolchain.gypi', 'features.gypi'],
   'target_defaults': {
     'type': 'executable',
     'dependencies': [
-      '../src/v8.gyp:v8',
-      '../src/v8.gyp:v8_libbase',
-      '../src/v8.gyp:v8_libplatform',
+      'v8.gyp:v8',
+      'v8.gyp:v8_libbase',
+      'v8.gyp:v8_libplatform',
     ],
     'include_dirs': [
       '..',
@@ -60,7 +37,7 @@
     {
       'target_name': 'v8_shell',
       'sources': [
-        'shell.cc',
+        '../samples/shell.cc',
       ],
       'conditions': [
         [ 'want_separate_host_toolset==1', {
@@ -71,13 +48,13 @@
     {
       'target_name': 'hello-world',
       'sources': [
-        'hello-world.cc',
+        '../samples/hello-world.cc',
       ],
     },
     {
       'target_name': 'process',
       'sources': [
-        'process.cc',
+        '../samples/process.cc',
       ],
     },
   ],

gypfiles/v8vtune.gyp

+# Copyright 2012 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'v8_code': 1,
+  },
+  'includes': ['toolchain.gypi', 'features.gypi'],
+  'targets': [
+    {
+      'target_name': 'v8_vtune',
+      'type': 'static_library',
+      'dependencies': [
+        'v8.gyp:v8',
+      ],
+      'sources': [
+        '../src/third_party/vtune/ittnotify_config.h',
+        '../src/third_party/vtune/ittnotify_types.h',
+        '../src/third_party/vtune/jitprofiling.cc',
+        '../src/third_party/vtune/jitprofiling.h',
+        '../src/third_party/vtune/v8-vtune.h',
+        '../src/third_party/vtune/vtune-jit.cc',
+        '../src/third_party/vtune/vtune-jit.h',
+      ],
+      'direct_dependent_settings': {
+        'defines': ['ENABLE_VTUNE_JIT_INTERFACE',],
+        'conditions': [
+          ['OS != "win"', {
+            'libraries': ['-ldl',],
+          }],
+        ],
+      },
+    },
+  ],
+}

tools/verify_source_deps.py → gypfiles/verify_source_deps.py

@@ -22,11 +22,11 @@ import sys
 V8_BASE = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
 GYP_FILES = [
-  os.path.join(V8_BASE, 'src', 'd8.gyp'),
-  os.path.join(V8_BASE, 'src', 'v8.gyp'),
-  os.path.join(V8_BASE, 'src', 'inspector', 'inspector.gypi'),
-  os.path.join(V8_BASE, 'src', 'third_party', 'vtune', 'v8vtune.gyp'),
-  os.path.join(V8_BASE, 'samples', 'samples.gyp'),
+  os.path.join(V8_BASE, 'gypfiles', 'd8.gyp'),
+  os.path.join(V8_BASE, 'gypfiles', 'v8.gyp'),
+  os.path.join(V8_BASE, 'gypfiles', 'inspector.gypi'),
+  os.path.join(V8_BASE, 'gypfiles', 'v8vtune.gyp'),
+  os.path.join(V8_BASE, 'gypfiles', 'samples.gyp'),
   os.path.join(V8_BASE, 'test', 'cctest', 'cctest.gyp'),
   os.path.join(V8_BASE, 'test', 'fuzzer', 'fuzzer.gyp'),
   os.path.join(V8_BASE, 'test', 'unittests', 'unittests.gyp'),

src/third_party/vtune/v8vtune.gyp

-# Copyright 2012 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
-  'variables': {
-    'v8_code': 1,
-  },
-  'includes': ['../../../gypfiles/toolchain.gypi', '../../../gypfiles/features.gypi'],
-  'targets': [
-    {
-      'target_name': 'v8_vtune',
-      'type': 'static_library',
-      'dependencies': [
-        '../../v8.gyp:v8',
-      ],
-      'sources': [
-        'ittnotify_config.h',
-        'ittnotify_types.h',
-        'jitprofiling.cc',
-        'jitprofiling.h',
-        'v8-vtune.h',
-        'vtune-jit.cc',
-        'vtune-jit.h',
-      ],
-      'direct_dependent_settings': {
-        'defines': ['ENABLE_VTUNE_JIT_INTERFACE',],
-        'conditions': [
-          ['OS != "win"', {
-            'libraries': ['-ldl',],
-          }],   
-        ],
-      },
-    },
-  ],
-}

test/benchmarks/benchmarks.gyp

@@ -10,7 +10,7 @@
           'target_name': 'benchmarks_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/cctest/cctest.gyp

@@ -31,7 +31,7 @@
   'variables': {
     'v8_code': 1,
     'generated_file': '<(SHARED_INTERMEDIATE_DIR)/resources.cc',
-    'cctest_sources': [  ### gcmole(all) ###
+    'cctest_sources': [
       'compiler/c-signature.h',
       'compiler/call-tester.h',
       'compiler/codegen-tester.cc',
@@ -228,7 +228,7 @@
       'wasm/wasm-run-utils.cc',
       'wasm/wasm-run-utils.h',
     ],
-    'cctest_sources_ia32': [  ### gcmole(arch:ia32) ###
+    'cctest_sources_ia32': [
       'test-assembler-ia32.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -237,7 +237,7 @@
       'test-log-stack-tracer.cc',
       'test-run-wasm-relocation-ia32.cc',
     ],
-    'cctest_sources_x64': [  ### gcmole(arch:x64) ###
+    'cctest_sources_x64': [
       'test-assembler-x64.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -247,7 +247,7 @@
       'test-log-stack-tracer.cc',
       'test-run-wasm-relocation-x64.cc',
     ],
-    'cctest_sources_arm': [  ### gcmole(arch:arm) ###
+    'cctest_sources_arm': [
       'assembler-helper-arm.cc',
       'assembler-helper-arm.h',
       'test-assembler-arm.cc',
@@ -259,7 +259,7 @@
       'test-run-wasm-relocation-arm.cc',
       'test-sync-primitives-arm.cc',
     ],
-    'cctest_sources_arm64': [  ### gcmole(arch:arm64) ###
+    'cctest_sources_arm64': [
       'test-utils-arm64.cc',
       'test-utils-arm64.h',
       'test-assembler-arm64.cc',
@@ -273,19 +273,19 @@
       'test-run-wasm-relocation-arm64.cc',
       'test-sync-primitives-arm64.cc',
     ],
-    'cctest_sources_s390': [  ### gcmole(arch:s390) ###
+    'cctest_sources_s390': [
       'test-assembler-s390.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
       'test-disasm-s390.cc',
     ],
-    'cctest_sources_ppc': [  ### gcmole(arch:ppc) ###
+    'cctest_sources_ppc': [
       'test-assembler-ppc.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
       'test-disasm-ppc.cc',
     ],
-    'cctest_sources_mips': [  ### gcmole(arch:mips) ###
+    'cctest_sources_mips': [
       'test-assembler-mips.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -293,7 +293,7 @@
       'test-disasm-mips.cc',
       'test-macro-assembler-mips.cc',
     ],
-    'cctest_sources_mipsel': [  ### gcmole(arch:mipsel) ###
+    'cctest_sources_mipsel': [
       'test-assembler-mips.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -301,7 +301,7 @@
       'test-disasm-mips.cc',
       'test-macro-assembler-mips.cc',
     ],
-    'cctest_sources_mips64': [  ### gcmole(arch:mips64) ###
+    'cctest_sources_mips64': [
       'test-assembler-mips64.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -309,7 +309,7 @@
       'test-disasm-mips64.cc',
       'test-macro-assembler-mips64.cc',
     ],
-    'cctest_sources_mips64el': [  ### gcmole(arch:mips64el) ###
+    'cctest_sources_mips64el': [
       'test-assembler-mips64.cc',
       'test-code-stubs.cc',
       'test-code-stubs.h',
@@ -325,8 +325,8 @@
       'type': 'executable',
       'dependencies': [
         'resources',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8_libplatform',
       ],
       'include_dirs': [
         '../..',
@@ -424,13 +424,13 @@
         ['component=="shared_library"', {
           # cctest can't be built against a shared library, so we need to
           # depend on the underlying static target in that case.
-          'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
+          'dependencies': ['../../gypfiles/v8.gyp:v8_maybe_snapshot'],
           'defines': [ 'BUILDING_V8_SHARED', ]
         }, {
-          'dependencies': ['../../src/v8.gyp:v8'],
+          'dependencies': ['../../gypfiles/v8.gyp:v8'],
         }],
         ['v8_use_snapshot=="true"', {
-          'dependencies': ['../../src/v8.gyp:v8_initializers'],
+          'dependencies': ['../../gypfiles/v8.gyp:v8_initializers'],
         }],
       ],
     },
@@ -474,9 +474,9 @@
       'target_name': 'generate-bytecode-expectations',
       'type': 'executable',
       'dependencies': [
-        '../../src/v8.gyp:v8',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8_libplatform',
       ],
       'include_dirs+': [
         '../..',

test/debugger/debugger.gyp

@@ -10,7 +10,7 @@
           'target_name': 'debugger_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/fuzzer/fuzzer.gyp

@@ -25,13 +25,13 @@
       'target_name': 'json_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'json.cc',
       ],
     },
@@ -52,13 +52,13 @@
       'target_name': 'parser_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'parser.cc',
       ],
     },
@@ -79,13 +79,13 @@
       'target_name': 'regexp_builtins_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'regexp-builtins.cc',
         'regexp_builtins/mjsunit.js.h',
       ],
@@ -107,13 +107,13 @@
       'target_name': 'regexp_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'regexp.cc',
       ],
     },
@@ -134,13 +134,13 @@
       'target_name': 'multi_return_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         '../compiler/c-signature.h',
         '../compiler/call-helper.h',
         '../compiler/raw-machine-assembler-tester.h',
@@ -164,13 +164,13 @@
       'target_name': 'wasm_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -195,13 +195,13 @@
       'target_name': 'wasm_async_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-async.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -226,13 +226,13 @@
       'target_name': 'wasm_call_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-call.cc',
         '../common/wasm/test-signatures.h',
         '../common/wasm/wasm-module-runner.cc',
@@ -258,13 +258,13 @@
       'target_name': 'wasm_code_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-code.cc',
         '../common/wasm/test-signatures.h',
         '../common/wasm/wasm-module-runner.cc',
@@ -290,13 +290,13 @@
       'target_name': 'wasm_compile_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-compile.cc',
         '../common/wasm/test-signatures.h',
         '../common/wasm/wasm-module-runner.cc',
@@ -322,13 +322,13 @@
       'target_name': 'wasm_data_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-data-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -353,13 +353,13 @@
       'target_name': 'wasm_function_sigs_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-function-sigs-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -384,13 +384,13 @@
       'target_name': 'wasm_globals_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-globals-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -415,13 +415,13 @@
       'target_name': 'wasm_imports_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-imports-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -446,13 +446,13 @@
       'target_name': 'wasm_memory_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-memory-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -477,13 +477,13 @@
       'target_name': 'wasm_names_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-names-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -508,13 +508,13 @@
       'target_name': 'wasm_types_section_fuzzer_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libplatform',
         'fuzzer_support',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'wasm-types-section.cc',
         '../common/wasm/wasm-module-runner.cc',
         '../common/wasm/wasm-module-runner.h',
@@ -526,14 +526,14 @@
       'target_name': 'fuzzer_support',
       'type': 'static_library',
       'dependencies': [
-        '../../src/v8.gyp:v8',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8_libplatform',
       ],
       'include_dirs': [
         '../..',
       ],
-      'sources': [  ### gcmole(all) ###
+      'sources': [
         'fuzzer-support.cc',
         'fuzzer-support.h',
       ],

test/inspector/inspector.gyp

@@ -12,9 +12,9 @@
       'target_name': 'inspector-test',
       'type': 'executable',
       'dependencies': [
-        '../../src/v8.gyp:v8_libplatform',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8',
+        '../../gypfiles/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8',
       ],
       'include_dirs': [
         '../..',

test/intl/intl.gyp

@@ -10,7 +10,7 @@
           'target_name': 'intl_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/message/message.gyp

@@ -10,7 +10,7 @@
           'target_name': 'message_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/mjsunit/mjsunit.gyp

@@ -10,7 +10,7 @@
           'target_name': 'mjsunit_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/mkgrokdump/mkgrokdump.gyp

@@ -12,9 +12,9 @@
       'target_name': 'mkgrokdump',
       'type': 'executable',
       'dependencies': [
-        '../../src/v8.gyp:v8',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8_libplatform',
       ],
       'include_dirs': [
         '../..',

test/mozilla/mozilla.gyp

@@ -10,7 +10,7 @@
           'target_name': 'mozilla_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/perf.gyp

@@ -11,7 +11,7 @@
           'type': 'none',
           'dependencies': [
             'cctest/cctest.gyp:cctest_exe_run',
-            '../src/d8.gyp:d8_run',
+            '../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../gypfiles/features.gypi',

test/preparser/preparser.gyp

@@ -10,7 +10,7 @@
           'target_name': 'preparser_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/test262/test262.gyp

@@ -10,7 +10,7 @@
           'target_name': 'test262_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/unittests/unittests.gyp

@@ -7,7 +7,7 @@
 {
   'variables': {
     'v8_code': 1,
-    'unittests_sources': [  ### gcmole(all) ###
+    'unittests_sources': [
       'allocation-unittest.cc',
       'api/access-check-unittest.cc',
       'api/exception-unittest.cc',
@@ -170,28 +170,28 @@
       'wasm/wasm-module-builder-unittest.cc',
       'wasm/wasm-opcodes-unittest.cc',
     ],
-    'unittests_sources_arm': [  ### gcmole(arch:arm) ###
+    'unittests_sources_arm': [
       'compiler/arm/instruction-selector-arm-unittest.cc',
     ],
-    'unittests_sources_arm64': [  ### gcmole(arch:arm64) ###
+    'unittests_sources_arm64': [
       'compiler/arm64/instruction-selector-arm64-unittest.cc',
     ],
-    'unittests_sources_ia32': [  ### gcmole(arch:ia32) ###
+    'unittests_sources_ia32': [
       'compiler/ia32/instruction-selector-ia32-unittest.cc',
     ],
-    'unittests_sources_mips': [  ### gcmole(arch:mips) ###
+    'unittests_sources_mips': [
       'compiler/mips/instruction-selector-mips-unittest.cc',
     ],
-    'unittests_sources_mips64': [  ### gcmole(arch:mips64) ###
+    'unittests_sources_mips64': [
       'compiler/mips64/instruction-selector-mips64-unittest.cc',
     ],
-    'unittests_sources_x64': [  ### gcmole(arch:x64) ###
+    'unittests_sources_x64': [
       'compiler/x64/instruction-selector-x64-unittest.cc',
     ],
-    'unittests_sources_ppc': [  ### gcmole(arch:ppc) ###
+    'unittests_sources_ppc': [
       'compiler/ppc/instruction-selector-ppc-unittest.cc',
     ],
-    'unittests_sources_s390': [  ### gcmole(arch:s390) ###
+    'unittests_sources_s390': [
       'compiler/s390/instruction-selector-s390-unittest.cc',
     ],
   },
@@ -206,10 +206,10 @@
       'dependencies': [
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
-        '../../src/v8.gyp:v8',
-        '../../src/v8.gyp:v8_libbase',
-        '../../src/v8.gyp:v8_libplatform',
-        '../../src/v8.gyp:v8_maybe_snapshot',
+        '../../gypfiles/v8.gyp:v8',
+        '../../gypfiles/v8.gyp:v8_libbase',
+        '../../gypfiles/v8.gyp:v8_libplatform',
+        '../../gypfiles/v8.gyp:v8_maybe_snapshot',
       ],
       'include_dirs': [
         '../..',
@@ -278,7 +278,7 @@
           ],
         }],
         ['v8_use_snapshot=="true"', {
-          'dependencies': ['../../src/v8.gyp:v8_initializers'],
+          'dependencies': ['../../gypfiles/v8.gyp:v8_initializers'],
         }],
       ],
     },

test/wasm-spec-tests/wasm-spec-tests.gyp

@@ -10,7 +10,7 @@
           'target_name': 'wasm_spec_tests_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

test/webkit/webkit.gyp

@@ -10,7 +10,7 @@
           'target_name': 'webkit_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

tools/check-static-initializers.gyp

@@ -10,7 +10,7 @@
           'target_name': 'check_static_initializers_run',
           'type': 'none',
           'dependencies': [
-            '../src/d8.gyp:d8_run',
+            '../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../gypfiles/features.gypi',

tools/gcmole/gcmole.lua

@@ -181,34 +181,6 @@ function InvokeClangPluginForEachFile(filenames, cfg, func)
 end
 
 -------------------------------------------------------------------------------
--- GYP file parsing
-
--- TODO(machenbach): Remove this when deprecating gyp.
-local function ParseGYPFile()
-   local result = {}
-   local gyp_files = {
-       { "src/v8.gyp",             "'([^']-%.cc)'",      "src/"         },
-       { "test/cctest/cctest.gyp", "'(test-[^']-%.cc)'", "test/cctest/" }
-   }
-
-   for i = 1, #gyp_files do
-      local filename = gyp_files[i][1]
-      local pattern = gyp_files[i][2]
-      local prefix = gyp_files[i][3]
-      local gyp_file = assert(io.open(filename), "failed to open GYP file")
-      local gyp = gyp_file:read('*a')
-      for condition, sources in
-         gyp:gmatch "%[.-### gcmole%((.-)%) ###(.-)%]" do
-         if result[condition] == nil then result[condition] = {} end
-         for file in sources:gmatch(pattern) do
-            table.insert(result[condition], prefix .. file)
-         end
-      end
-      gyp_file:close()
-   end
-
-   return result
-end
 
 local function ParseGNFile()
    local result = {}
@@ -258,34 +230,8 @@ local function BuildFileList(sources, props)
 end
 
 
-local gyp_sources = ParseGYPFile()
 local gn_sources = ParseGNFile()
 
--- TODO(machenbach): Remove this comparison logic when deprecating gyp.
-local function CompareSources(sources1, sources2, what)
-  for condition, files1 in pairs(sources1) do
-    local files2 = sources2[condition]
-    assert(
-      files2 ~= nil,
-      "Missing gcmole condition in " .. what .. ": " .. condition)
-
-    -- Turn into set for speed.
-    files2_set = {}
-    for i, file in pairs(files2) do files2_set[file] = true end
-
-    for i, file in pairs(files1) do
-      assert(
-        files2_set[file] ~= nil,
-        "Missing file " .. file .. " in " .. what .. " for condition " ..
-        condition)
-    end
-  end
-end
-
-CompareSources(gyp_sources, gn_sources, "GN")
-CompareSources(gn_sources, gyp_sources, "GYP")
-
-
 local function FilesForArch(arch)
    return BuildFileList(gn_sources, { os = 'linux',
                                       arch = arch,

tools/jsfunfuzz/jsfunfuzz.gyp

@@ -10,7 +10,7 @@
           'target_name': 'jsfunfuzz_run',
           'type': 'none',
           'dependencies': [
-            '../../src/d8.gyp:d8_run',
+            '../../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../../gypfiles/features.gypi',

tools/parser-shell.gyp

@@ -36,9 +36,9 @@
       'target_name': 'parser-shell',
       'type': 'executable',
       'dependencies': [
-        '../src/v8.gyp:v8',
-        '../src/v8.gyp:v8_libbase',
-        '../src/v8.gyp:v8_libplatform',
+        '../gypfiles/v8.gyp:v8',
+        '../gypfiles/v8.gyp:v8_libbase',
+        '../gypfiles/v8.gyp:v8_libplatform',
       ],
       'conditions': [
         ['v8_enable_i18n_support==1', {

tools/run-num-fuzzer.gyp

@@ -10,7 +10,7 @@
           'target_name': 'run_num_fuzzer_run',
           'type': 'none',
           'dependencies': [
-            '../src/d8.gyp:d8_run',
+            '../gypfiles/d8.gyp:d8_run',
           ],
           'includes': [
             '../gypfiles/features.gypi',