Revert "[gn] Consolidate exec_script calls to speed up generation"

runtime/bin/BUILD.gn

 # Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-import("gypi_contents.gni")
-
 declare_args() {
   # Whether to fall back to built-in root certificates when they cannot be
   # verified at the operating system level.
   dart_use_fallback_root_certificates = false
 
   # The BUILD.gn file that we pull from chromium as part of zlib has a
   # dependence on //base, which we don't pull in. In a standalone build of the
   # VM, we set this to //runtime/bin/zlib where we have a BUILD.gn file without
   # a dependence on //base.
   dart_zlib_path = "//third_party/zlib"
 
   # Whether to link the standalone VM against tcmalloc. The standalone build of
   # the VM enables this only for Linux builds.
   dart_use_tcmalloc = false
 }
 
+resources_sources_gypi =
+    exec_script("../../tools/gypi_to_gn.py",
+                [ rebase_path("vmservice/vmservice_sources.gypi") ],
+                "scope",
+                [ "vmservice/vmservice_sources.gypi" ])
+
 # Generate a resources.cc file for the service isolate without Observatory.
 action("gen_resources_cc") {
   visibility = [ ":*" ]  # Only targets in this file can see this.
   script = "../tools/create_resources.py"
   inputs = [
     "../tools/create_resources.py",
   ]
 
   # The path below is hard coded for the Mojo and Flutter trees. When moving
   # the Dart runtime to gn, this path might need to be updated.
-  sources = rebase_path(resources_sources_gypi, "", "../bin/vmservice/")
+  sources = rebase_path(resources_sources_gypi.sources, "", "../bin/vmservice/")
   outputs = [
     "$target_gen_dir/resources_gen.cc",
   ]
   args = [
            "--output",
            rebase_path("$target_gen_dir/resources_gen.cc", root_build_dir),
            "--outer_namespace",
            "dart",
            "--inner_namespace",
            "bin",
@@ skipping 31 matching lines @@
              "--include",
              "bin/builtin.h",
              "--var_name",
              "dart::bin::Builtin::${name}_${kind}_paths_",
              "--library_name",
              library_name,
            ] + rebase_path(invoker.sources, root_build_dir)
   }
 }
 
+builtin_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
+                                   [ rebase_path("builtin_sources.gypi") ],
+                                   "scope",
+                                   [ "builtin_sources.gypi" ])
+
 gen_library_src_path("generate_builtin_cc_file") {
   name = "_builtin"
   kind = "source"
-  sources = builtin_sources_gypi
+  sources = builtin_sources_gypi.sources
   output = "$target_gen_dir/builtin_gen.cc"
 }
 
 sdk_io_sources_gypi =
     exec_script("../../tools/gypi_to_gn.py",
                 [ rebase_path("../../sdk/lib/io/io_sources.gypi") ],
                 "scope",
                 [ "../../sdk/lib/io/io_sources.gypi" ])
 sdk_io_sources =
     rebase_path(sdk_io_sources_gypi.sources, ".", "../../sdk/lib/io")
 
 gen_library_src_path("generate_io_cc_file") {
   name = "io"
   kind = "source"
   sources = [ "../../sdk/lib/io/io.dart" ] + sdk_io_sources
   output = "$target_gen_dir/io_gen.cc"
 }
 
+io_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
+                              [ rebase_path("io_sources.gypi") ],
+                              "scope",
+                              [ "io_sources.gypi" ])
+
 gen_library_src_path("generate_io_patch_cc_file") {
   name = "io"
   kind = "patch"
-  sources = io_sources_gypi
+  sources = io_sources_gypi.sources
   output = "$target_gen_dir/io_patch_gen.cc"
 }
 
 gen_library_src_path("generate_html_cc_file") {
   name = "html"
   kind = "source"
   sources = [
     "../../sdk/lib/html/dartium/html_dartium.dart",
   ]
   output = "$target_gen_dir/html_gen.cc"
@@ skipping 111 matching lines @@
     libs = [ "dl" ]
   }
   if (is_android) {
     libs += [
       "android",
       "log",
     ]
   }
 }
 
+builtin_impl_sources_gypi =
+    exec_script("../../tools/gypi_to_gn.py",
+                [ rebase_path("builtin_impl_sources.gypi") ],
+                "scope",
+                [ "builtin_impl_sources.gypi" ])
+
 static_library("libdart_builtin") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
   ]
   public_configs = [ ":libdart_builtin_config" ]
   deps = [
     ":generate_blink_cc_file",
     ":generate_builtin_cc_file",
     ":generate_cached_patches_cc_file",
@@ skipping 14 matching lines @@
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = [
               "log_android.cc",
               "log_fuchsia.cc",
               "log_linux.cc",
               "log_macos.cc",
               "log_win.cc",
-            ] + builtin_impl_sources_gypi
+            ] + builtin_impl_sources_gypi.sources
 }
 
+io_impl_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
+                                   [ rebase_path("io_impl_sources.gypi") ],
+                                   "scope",
+                                   [ "io_impl_sources.gypi" ])
+
 executable("gen_snapshot") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
     "..:dart_precompiler_config",
   ]
   deps = [
     ":gen_resources_cc",
     ":gen_snapshot_dart_io",
     ":generate_builtin_cc_file",
@@ skipping 65 matching lines @@
     # Dart tree uses *_macos.* instead of *_mac.*
     custom_sources_filter += [
       "*_macos.h",
       "*_macos.cc",
     ]
   }
   set_sources_assignment_filter(custom_sources_filter)
 
   defines = [ "DART_IO_SECURE_SOCKET_DISABLED" ]
 
-  sources = io_impl_sources_gypi + builtin_impl_sources_gypi
+  sources = io_impl_sources_gypi.sources + builtin_impl_sources_gypi.sources
   sources += [
     "io_natives.cc",
     "io_natives.h",
   ]
 
   include_dirs = [
     "..",
     "//third_party",
   ]
 }
@@ skipping 45 matching lines @@
         libs += [ "CoreServices.framework" ]
       }
     } else if (defined(is_fuchsia) && is_fuchsia) {
       defines += [ "DART_IO_SECURE_SOCKET_DISABLED" ]
     } else {
       deps = [
         "//third_party/boringssl",
       ]
     }
 
-    sources = io_impl_sources_gypi + builtin_impl_sources_gypi
+    sources = io_impl_sources_gypi.sources + builtin_impl_sources_gypi.sources
     sources += [
                  "builtin_natives.cc",
                  "io_natives.cc",
                  "io_natives.h",
                  "log_android.cc",
                  "log_linux.cc",
                  "log_macos.cc",
                  "log_win.cc",
                  "log.h",
                ] + extra_sources
@@ skipping 337 matching lines @@
     "$target_gen_dir",
   ]
   defines = [ "TESTING" ]
 
   if (dart_use_tcmalloc) {
     deps += [ "//third_party/tcmalloc" ]
   }
 
   # The VM sources are already included in libdart, so we just want to add in
   # the tests here.
-  vm_tests = rebase_path(vm_tests_list, ".", "../vm")
+  vm_tests_list = exec_script("../../tools/gypi_to_gn.py",
+                              [
+                                rebase_path("../vm/vm_sources.gypi"),
+                                "--keep_only=_test.cc",
+                                "--keep_only=_test.h",
+                              ],
+                              "scope",
+                              [ "../vm/vm_sources.gypi" ])
+  vm_tests = rebase_path(vm_tests_list.sources, ".", "../vm")
+
+  builtin_impl_tests_list =
+      exec_script("../../tools/gypi_to_gn.py",
+                  [
+                    rebase_path("builtin_impl_sources.gypi"),
+                    "--keep_only=_test.cc",
+                    "--keep_only=_test.h",
+                  ],
+                  "scope",
+                  [ "builtin_impl_sources.gypi" ])
 
   sources = [
               "builtin_nolib.cc",
               "run_vm_tests.cc",
-            ] + builtin_impl_tests_list + vm_tests
+            ] + builtin_impl_tests_list.sources + vm_tests
 
   if (!is_win) {
     ldflags = [ "-rdynamic" ]
   }
 
   if (is_win) {
     libs = [
       "iphlpapi.lib",
       "psapi.lib",
       "ws2_32.lib",
@@ skipping 37 matching lines @@
       # The only effect of DART_SHARED_LIB is to export the Dart API.
       "DART_SHARED_LIB",
     ]
     if (is_win) {
       libs = [ "dart.lib" ]
       abs_root_out_dir = rebase_path(root_out_dir)
       ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
     }
   }
 }