| Index: runtime/vm/BUILD.gn
|
| diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn
|
| index f8369093bf961d095aaf1af11652aec4e8845200..5baea6e76f435d4b159af03f05176814ce3aef28 100644
|
| --- a/runtime/vm/BUILD.gn
|
| +++ b/runtime/vm/BUILD.gn
|
| @@ -4,9 +4,34 @@
|
|
|
| import("../../build/executable_suffix.gni")
|
| import("../../build/prebuilt_dart_sdk.gni")
|
| +import("../../sdk/lib/async/async_sources.gni")
|
| +import("../../sdk/lib/collection/collection_sources.gni")
|
| +import("../../sdk/lib/convert/convert_sources.gni")
|
| +import("../../sdk/lib/core/core_sources.gni")
|
| +import("../../sdk/lib/developer/developer_sources.gni")
|
| +import("../../sdk/lib/internal/internal_sources.gni")
|
| +import("../../sdk/lib/isolate/isolate_sources.gni")
|
| +import("../../sdk/lib/math/math_sources.gni")
|
| +import("../../sdk/lib/mirrors/mirrors_sources.gni")
|
| +import("../../sdk/lib/profiler/profiler_sources.gni")
|
| +import("../../sdk/lib/typed_data/typed_data_sources.gni")
|
| +import("../../sdk/lib/vmservice/vmservice_sources.gni")
|
| import("../../utils/generate_patch_sdk.gni")
|
| -import("gypi_contents.gni")
|
| +import("../bin/io_sources.gni")
|
| +import("../lib/async_sources.gni")
|
| +import("../lib/collection_sources.gni")
|
| +import("../lib/convert_sources.gni")
|
| +import("../lib/core_sources.gni")
|
| +import("../lib/developer_sources.gni")
|
| +import("../lib/internal_sources.gni")
|
| +import("../lib/isolate_sources.gni")
|
| +import("../lib/math_sources.gni")
|
| +import("../lib/mirrors_sources.gni")
|
| +import("../lib/profiler_sources.gni")
|
| +import("../lib/typed_data_sources.gni")
|
| +import("../lib/vmservice_sources.gni")
|
| import("../runtime_args.gni")
|
| +import("vm_sources.gni")
|
|
|
| config("libdart_vm_config") {
|
| if (is_fuchsia) {
|
| @@ -28,37 +53,6 @@ config("libdart_vm_config") {
|
| }
|
| }
|
|
|
| -template("build_libdart_platform") {
|
| - extra_configs = []
|
| - if (defined(invoker.extra_configs)) {
|
| - extra_configs += invoker.extra_configs
|
| - }
|
| - static_library(target_name) {
|
| - configs += [ "..:dart_config" ] + extra_configs
|
| - if (is_fuchsia) {
|
| - configs -= [ "//build/config:symbol_visibility_hidden" ]
|
| - deps = [
|
| - "//apps/tracing/lib/trace",
|
| - ]
|
| - }
|
| - public_configs = [ ":libdart_vm_config" ]
|
| -
|
| - sources = rebase_path(processed_gypis.platform_sources, ".", "../platform")
|
| -
|
| - include_dirs = [ ".." ]
|
| - }
|
| -}
|
| -
|
| -build_libdart_platform("libdart_platform") {
|
| - extra_configs = [ "..:dart_maybe_product_config" ]
|
| -}
|
| -
|
| -build_libdart_platform("libdart_platform_product") {
|
| - extra_configs = [ "..:dart_product_config" ]
|
| -}
|
| -
|
| -vm_sources_list = processed_gypis.vm_sources
|
| -
|
| template("build_libdart_vm") {
|
| extra_configs = []
|
| if (defined(invoker.extra_configs)) {
|
| @@ -77,7 +71,7 @@ template("build_libdart_vm") {
|
| "*_test.cc",
|
| "*_test.h",
|
| ])
|
| - sources = vm_sources_list
|
| + sources = vm_sources
|
| include_dirs = [ ".." ]
|
| }
|
| }
|
| @@ -327,112 +321,117 @@ generate_core_libraries("core_libraries") {
|
| sources = [
|
| [
|
| "async",
|
| - processed_gypis.async_sdk_sources,
|
| + async_sdk_sources,
|
| "../../sdk/lib/async",
|
| "async",
|
| true,
|
| - processed_gypis.async_runtime_sources,
|
| - "../lib",
|
| - ],
|
| - [
|
| - "core",
|
| - processed_gypis.core_sdk_sources,
|
| - "../../sdk/lib/core",
|
| - "core",
|
| - true,
|
| - processed_gypis.core_runtime_sources,
|
| + async_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "collection",
|
| - processed_gypis.collection_sdk_sources,
|
| + collection_sdk_sources,
|
| "../../sdk/lib/collection",
|
| "collection",
|
| true,
|
| - processed_gypis.collection_runtime_sources,
|
| + collection_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "convert",
|
| - processed_gypis.convert_sdk_sources,
|
| + convert_sdk_sources,
|
| "../../sdk/lib/convert",
|
| "convert",
|
| true,
|
| - processed_gypis.convert_runtime_sources,
|
| + convert_runtime_sources,
|
| + "../lib",
|
| + ],
|
| + [
|
| + "core",
|
| + core_sdk_sources,
|
| + "../../sdk/lib/core",
|
| + "core",
|
| + true,
|
| + core_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "developer",
|
| - processed_gypis.developer_sdk_sources,
|
| + developer_sdk_sources,
|
| "../../sdk/lib/developer",
|
| "developer",
|
| true,
|
| - processed_gypis.developer_runtime_sources,
|
| + developer_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "_internal",
|
| - processed_gypis.internal_sdk_sources,
|
| + internal_sdk_sources,
|
| "../../sdk/lib/internal",
|
| "internal",
|
| true,
|
| - processed_gypis.internal_runtime_sources,
|
| + internal_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "isolate",
|
| - processed_gypis.isolate_sdk_sources,
|
| + isolate_sdk_sources,
|
| "../../sdk/lib/isolate",
|
| "isolate",
|
| true,
|
| - processed_gypis.isolate_runtime_sources,
|
| + isolate_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "math",
|
| - processed_gypis.math_sdk_sources,
|
| + math_sdk_sources,
|
| "../../sdk/lib/math",
|
| "math",
|
| true,
|
| - processed_gypis.math_runtime_sources,
|
| + math_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "mirrors",
|
| - processed_gypis.mirrors_sdk_sources,
|
| + mirrors_sdk_sources,
|
| "../../sdk/lib/mirrors",
|
| "mirrors",
|
| true,
|
| - processed_gypis.mirrors_runtime_sources,
|
| + mirrors_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "profiler",
|
| - processed_gypis.profiler_sdk_sources,
|
| + profiler_sdk_sources,
|
| "../../sdk/lib/profiler",
|
| "profiler",
|
| false,
|
| ],
|
| [
|
| "typed_data",
|
| - processed_gypis.typed_data_sdk_sources,
|
| + typed_data_sdk_sources,
|
| "../../sdk/lib/typed_data",
|
| "typed_data",
|
| true,
|
| - processed_gypis.typed_data_runtime_sources,
|
| + typed_data_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "_vmservice",
|
| - processed_gypis.vmservice_sdk_sources,
|
| + vmservice_sdk_sources,
|
| "../../sdk/lib/vmservice",
|
| "vmservice",
|
| true,
|
| - processed_gypis.vmservice_runtime_sources,
|
| + vmservice_runtime_sources,
|
| "../lib",
|
| ],
|
| ]
|
| - allsources = processed_gypis.allsources
|
| + 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
|
| }
|
|
|
| template("concatenate_patch") {
|
| @@ -482,67 +481,67 @@ generate_vm_patched_sdk("patched_sdk") {
|
| libraries = [
|
| [
|
| "async",
|
| - processed_gypis.async_runtime_sources,
|
| + async_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "collection",
|
| - processed_gypis.collection_runtime_sources,
|
| + collection_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "convert",
|
| - processed_gypis.convert_runtime_sources,
|
| + convert_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "core",
|
| - processed_gypis.core_runtime_sources,
|
| + core_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "developer",
|
| - processed_gypis.developer_runtime_sources,
|
| + developer_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "internal",
|
| - processed_gypis.internal_runtime_sources,
|
| + internal_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "isolate",
|
| - processed_gypis.isolate_runtime_sources,
|
| + isolate_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "math",
|
| - processed_gypis.math_runtime_sources,
|
| + math_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "mirrors",
|
| - processed_gypis.mirrors_runtime_sources,
|
| + mirrors_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "profiler",
|
| - processed_gypis.profiler_runtime_sources,
|
| + profiler_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "typed_data",
|
| - processed_gypis.typed_data_runtime_sources,
|
| + typed_data_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "vmservice",
|
| - processed_gypis.vmservice_runtime_sources,
|
| + vmservice_runtime_sources,
|
| "../lib",
|
| ],
|
| [
|
| "io",
|
| - processed_gypis.bin_io_sources,
|
| + io_runtime_sources,
|
| "../bin",
|
| ],
|
| ]
|
|
|