diff --git a/runtime/bin/cli_sources.gni b/runtime/bin/cli_sources.gni index 532fbba9dab..ed72a04e9dc 100644 --- a/runtime/bin/cli_sources.gni +++ b/runtime/bin/cli_sources.gni @@ -3,4 +3,4 @@ # BSD-style license that can be found in the LICENSE file. # This file contains all sources for the dart:cli library. -cli_runtime_sources = [ "cli_patch.dart" ] +cli_runtime_dart_files = [ "cli_patch.dart" ] diff --git a/runtime/bin/io_sources.gni b/runtime/bin/io_sources.gni index 4bc7c1d8974..56de0e76bb8 100644 --- a/runtime/bin/io_sources.gni +++ b/runtime/bin/io_sources.gni @@ -3,7 +3,7 @@ # BSD-style license that can be found in the LICENSE file. # This file contains all sources for the dart:io library. -io_runtime_sources = [ +io_runtime_dart_files = [ "common_patch.dart", "directory_patch.dart", "eventhandler_patch.dart", diff --git a/runtime/lib/async_sources.gni b/runtime/lib/async_sources.gni index 914aa9ba985..d3fef9a1e69 100644 --- a/runtime/lib/async_sources.gni +++ b/runtime/lib/async_sources.gni @@ -12,5 +12,3 @@ async_runtime_dart_files = [ "schedule_microtask_patch.dart", "timer_patch.dart", ] - -async_runtime_sources = async_runtime_cc_files + async_runtime_dart_files diff --git a/runtime/lib/collection_sources.gni b/runtime/lib/collection_sources.gni index 1fa63d3923d..c3c15fc0fc1 100644 --- a/runtime/lib/collection_sources.gni +++ b/runtime/lib/collection_sources.gni @@ -10,6 +10,3 @@ collection_runtime_dart_files = [ "collection_patch.dart", "compact_hash.dart", ] - -collection_runtime_sources = - collection_runtime_cc_files + collection_runtime_dart_files diff --git a/runtime/lib/convert_sources.gni b/runtime/lib/convert_sources.gni index e37c0172503..123db64e483 100644 --- a/runtime/lib/convert_sources.gni +++ b/runtime/lib/convert_sources.gni @@ -2,4 +2,4 @@ # 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. -convert_runtime_sources = [ "convert_patch.dart" ] +convert_runtime_dart_files = [ "convert_patch.dart" ] diff --git a/runtime/lib/core_sources.gni b/runtime/lib/core_sources.gni index 4c57dc49581..825663a724f 100644 --- a/runtime/lib/core_sources.gni +++ b/runtime/lib/core_sources.gni @@ -59,5 +59,3 @@ core_runtime_dart_files = [ "uri_patch.dart", "weak_property.dart", ] - -core_runtime_sources = core_runtime_cc_files + core_runtime_dart_files diff --git a/runtime/lib/developer_sources.gni b/runtime/lib/developer_sources.gni index 61f02f629fe..a613da72790 100644 --- a/runtime/lib/developer_sources.gni +++ b/runtime/lib/developer_sources.gni @@ -16,6 +16,3 @@ developer_runtime_dart_files = [ "profiler.dart", "timeline.dart", ] - -developer_runtime_sources = - developer_runtime_cc_files + developer_runtime_dart_files diff --git a/runtime/lib/ffi_sources.gni b/runtime/lib/ffi_sources.gni index fd625f40913..9936dd22346 100644 --- a/runtime/lib/ffi_sources.gni +++ b/runtime/lib/ffi_sources.gni @@ -13,5 +13,3 @@ ffi_runtime_dart_files = [ "ffi_dynamic_library_patch.dart", "ffi_native_type_patch.dart", ] - -ffi_runtime_sources = ffi_runtime_cc_files + ffi_runtime_dart_files diff --git a/runtime/lib/internal_sources.gni b/runtime/lib/internal_sources.gni index d5550bcf808..7c173abdbb8 100644 --- a/runtime/lib/internal_sources.gni +++ b/runtime/lib/internal_sources.gni @@ -13,6 +13,3 @@ internal_runtime_dart_files = [ "print_patch.dart", "symbol_patch.dart", ] - -internal_runtime_sources = - internal_runtime_cc_files + internal_runtime_dart_files diff --git a/runtime/lib/isolate_sources.gni b/runtime/lib/isolate_sources.gni index 021e4eb530c..1495aaf2784 100644 --- a/runtime/lib/isolate_sources.gni +++ b/runtime/lib/isolate_sources.gni @@ -9,5 +9,3 @@ isolate_runtime_dart_files = [ "isolate_patch.dart", "timer_impl.dart", ] - -isolate_runtime_sources = isolate_runtime_cc_files + isolate_runtime_dart_files diff --git a/runtime/lib/math_sources.gni b/runtime/lib/math_sources.gni index 33f089e3d13..986010df4cb 100644 --- a/runtime/lib/math_sources.gni +++ b/runtime/lib/math_sources.gni @@ -5,5 +5,3 @@ math_runtime_cc_files = [ "math.cc" ] math_runtime_dart_files = [ "math_patch.dart" ] - -math_runtime_sources = math_runtime_cc_files + math_runtime_dart_files diff --git a/runtime/lib/mirrors_sources.gni b/runtime/lib/mirrors_sources.gni index c3a51c501bc..e92dcf0048b 100644 --- a/runtime/lib/mirrors_sources.gni +++ b/runtime/lib/mirrors_sources.gni @@ -15,5 +15,3 @@ mirrors_runtime_dart_files = [ "mirrors_impl.dart", "mirror_reference.dart", ] - -mirrors_runtime_sources = mirrors_runtime_cc_files + mirrors_runtime_dart_files diff --git a/runtime/lib/profiler_sources.gni b/runtime/lib/profiler_sources.gni index b27bc883842..b2ff2cac21a 100644 --- a/runtime/lib/profiler_sources.gni +++ b/runtime/lib/profiler_sources.gni @@ -3,4 +3,4 @@ # BSD-style license that can be found in the LICENSE file. # Sources list to keep vm/BUILD.gn generate_core_libraries happy. -profiler_runtime_sources = [ "empty_source.dart" ] +profiler_runtime_dart_files = [ "empty_source.dart" ] diff --git a/runtime/lib/typed_data_sources.gni b/runtime/lib/typed_data_sources.gni index 9892c8f3ac6..b10a82929f0 100644 --- a/runtime/lib/typed_data_sources.gni +++ b/runtime/lib/typed_data_sources.gni @@ -9,6 +9,3 @@ typed_data_runtime_cc_files = [ ] typed_data_runtime_dart_files = [ "typed_data_patch.dart" ] - -typed_data_runtime_sources = - typed_data_runtime_cc_files + typed_data_runtime_dart_files diff --git a/runtime/lib/vmservice_sources.gni b/runtime/lib/vmservice_sources.gni index a5e1131fbf7..b39e99b4e3e 100644 --- a/runtime/lib/vmservice_sources.gni +++ b/runtime/lib/vmservice_sources.gni @@ -3,4 +3,4 @@ # BSD-style license that can be found in the LICENSE file. # Sources that patch the library "dart:_vmservice". -vmservice_runtime_sources = [ "vmservice.cc" ] +vmservice_runtime_cc_files = [ "vmservice.cc" ] diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn index 599c9a96e94..5ccc5210cfa 100644 --- a/runtime/vm/BUILD.gn +++ b/runtime/vm/BUILD.gn @@ -101,13 +101,12 @@ library_for_all_configs("libdart_lib") { } } include_dirs = [ ".." ] - allsources = - async_runtime_sources + collection_runtime_sources + - convert_runtime_sources + core_runtime_sources + - developer_runtime_sources + internal_runtime_sources + - isolate_runtime_sources + math_runtime_sources + mirrors_runtime_sources + - profiler_runtime_sources + typed_data_runtime_sources + - vmservice_runtime_sources + ffi_runtime_sources + allsources = async_runtime_cc_files + collection_runtime_cc_files + + core_runtime_cc_files + developer_runtime_cc_files + + internal_runtime_cc_files + isolate_runtime_cc_files + + math_runtime_cc_files + mirrors_runtime_cc_files + + typed_data_runtime_cc_files + vmservice_runtime_cc_files + + ffi_runtime_cc_files sources = [ "bootstrap.cc" ] + rebase_path(allsources, ".", "../lib") snapshot_sources = [] nosnapshot_sources = []