| Index: runtime/bin/BUILD.gn
|
| diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
|
| index 43108fe7f58ee635ac606be4bd4985b0b44d9891..99e32ff3d63cec60663da9a855df175dcf68cc0d 100644
|
| --- a/runtime/bin/BUILD.gn
|
| +++ b/runtime/bin/BUILD.gn
|
| @@ -20,31 +20,36 @@ declare_args() {
|
|
|
| resources_sources_gypi =
|
| exec_script("../../tools/gypi_to_gn.py",
|
| - [rebase_path("vmservice/vmservice_sources.gypi")],
|
| + [ rebase_path("vmservice/vmservice_sources.gypi") ],
|
| "scope",
|
| - ["vmservice/vmservice_sources.gypi"])
|
| + [ "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.
|
| + 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.sources,
|
| - "",
|
| - "../bin/vmservice/")
|
| - outputs = [ "$target_gen_dir/resources_gen.cc" ]
|
| + 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",
|
| - "--table_name", "service_bin",
|
| - "--root_prefix", rebase_path(".", root_build_dir) + "/",
|
| - ] + rebase_path(sources, root_build_dir)
|
| + "--output",
|
| + rebase_path("$target_gen_dir/resources_gen.cc", root_build_dir),
|
| + "--outer_namespace",
|
| + "dart",
|
| + "--inner_namespace",
|
| + "bin",
|
| + "--table_name",
|
| + "service_bin",
|
| + "--root_prefix",
|
| + rebase_path(".", root_build_dir) + "/",
|
| + ] + rebase_path(sources, root_build_dir)
|
| }
|
|
|
| template("gen_library_src_path") {
|
| @@ -54,10 +59,12 @@ template("gen_library_src_path") {
|
| visibility = [ ":*" ] # Only targets in this file can see this.
|
| script = "../tools/gen_library_src_paths.py"
|
| inputs = [
|
| - "../tools/gen_library_src_paths.py",
|
| - "builtin_in.cc",
|
| - ] + invoker.sources
|
| - outputs = [ invoker.output, ]
|
| + "../tools/gen_library_src_paths.py",
|
| + "builtin_in.cc",
|
| + ] + invoker.sources
|
| + outputs = [
|
| + invoker.output,
|
| + ]
|
| name = invoker.name
|
| kind = invoker.kind
|
| library_name = "dart:${name}"
|
| @@ -65,20 +72,24 @@ template("gen_library_src_path") {
|
| library_name = invoker.library_name
|
| }
|
| args = [
|
| - "--output", rebase_path(invoker.output, root_build_dir),
|
| - "--input_cc", rebase_path("builtin_in.cc", root_build_dir),
|
| - "--include", "bin/builtin.h",
|
| - "--var_name", "dart::bin::Builtin::${name}_${kind}_paths_",
|
| - "--library_name", library_name,] +
|
| - rebase_path(invoker.sources, root_build_dir)
|
| + "--output",
|
| + rebase_path(invoker.output, root_build_dir),
|
| + "--input_cc",
|
| + rebase_path("builtin_in.cc", root_build_dir),
|
| + "--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"])
|
| +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"
|
| @@ -89,24 +100,23 @@ gen_library_src_path("generate_builtin_cc_file") {
|
|
|
| sdk_io_sources_gypi =
|
| exec_script("../../tools/gypi_to_gn.py",
|
| - [rebase_path("../../sdk/lib/io/io_sources.gypi")],
|
| + [ rebase_path("../../sdk/lib/io/io_sources.gypi") ],
|
| "scope",
|
| - ["../../sdk/lib/io/io_sources.gypi"])
|
| + [ "../../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
|
| + 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"])
|
| +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"
|
| @@ -118,7 +128,9 @@ gen_library_src_path("generate_io_patch_cc_file") {
|
| gen_library_src_path("generate_html_cc_file") {
|
| name = "html"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/html/dartium/html_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/html/dartium/html_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/html_gen.cc"
|
| }
|
|
|
| @@ -126,13 +138,13 @@ gen_library_src_path("generate_html_common_cc_file") {
|
| name = "html_common"
|
| kind = "source"
|
| sources = [
|
| - "../../sdk/lib/html/html_common/html_common.dart",
|
| + "../../sdk/lib/html/html_common/conversions.dart",
|
| + "../../sdk/lib/html/html_common/conversions_dartium.dart",
|
| "../../sdk/lib/html/html_common/css_class_set.dart",
|
| "../../sdk/lib/html/html_common/device.dart",
|
| "../../sdk/lib/html/html_common/filtered_element_list.dart",
|
| + "../../sdk/lib/html/html_common/html_common.dart",
|
| "../../sdk/lib/html/html_common/lists.dart",
|
| - "../../sdk/lib/html/html_common/conversions.dart",
|
| - "../../sdk/lib/html/html_common/conversions_dartium.dart",
|
| ]
|
| output = "$target_gen_dir/html_common_gen.cc"
|
| }
|
| @@ -140,28 +152,36 @@ gen_library_src_path("generate_html_common_cc_file") {
|
| gen_library_src_path("generate_js_cc_file") {
|
| name = "js"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/js/dartium/js_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/js/dartium/js_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/js_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_js_util_cc_file") {
|
| name = "js_util"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/js_util/dartium/js_util_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/js_util/dartium/js_util_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/js_util_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_blink_cc_file") {
|
| name = "_blink"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/_blink/dartium/_blink_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/_blink/dartium/_blink_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/blink_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_indexed_db_cc_file") {
|
| name = "indexed_db"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/indexed_db/dartium/indexed_db_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/indexed_db/dartium/indexed_db_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/indexed_db_gen.cc"
|
| }
|
|
|
| @@ -169,14 +189,18 @@ gen_library_src_path("generate_cached_patches_cc_file") {
|
| name = "cached_patches"
|
| library_name = "cached_patches.dart"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/js/dartium/cached_patches.dart"]
|
| + sources = [
|
| + "../../sdk/lib/js/dartium/cached_patches.dart",
|
| + ]
|
| output = "$target_gen_dir/cached_patches_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_web_gl_cc_file") {
|
| name = "web_gl"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/web_gl/dartium/web_gl_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/web_gl/dartium/web_gl_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/web_gl_gen.cc"
|
| }
|
|
|
| @@ -184,36 +208,42 @@ gen_library_src_path("generate_metadata_cc_file") {
|
| name = "metadata"
|
| library_name = "metadata.dart"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/html/html_common/metadata.dart"]
|
| + sources = [
|
| + "../../sdk/lib/html/html_common/metadata.dart",
|
| + ]
|
| output = "$target_gen_dir/metadata_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_web_sql_cc_file") {
|
| name = "web_sql"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/web_sql/dartium/web_sql_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/web_sql/dartium/web_sql_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/web_sql_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_svg_cc_file") {
|
| name = "svg"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/svg/dartium/svg_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/svg/dartium/svg_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/svg_gen.cc"
|
| }
|
|
|
| gen_library_src_path("generate_web_audio_cc_file") {
|
| name = "web_audio"
|
| kind = "source"
|
| - sources = ["../../sdk/lib/web_audio/dartium/web_audio_dartium.dart"]
|
| + sources = [
|
| + "../../sdk/lib/web_audio/dartium/web_audio_dartium.dart",
|
| + ]
|
| output = "$target_gen_dir/web_audio_gen.cc"
|
| }
|
|
|
| config("libdart_builtin_config") {
|
| if (!is_win) {
|
| - libs = [
|
| - "dl",
|
| - ]
|
| + libs = [ "dl" ]
|
| }
|
| if (is_android) {
|
| libs += [
|
| @@ -225,54 +255,58 @@ config("libdart_builtin_config") {
|
|
|
| builtin_impl_sources_gypi =
|
| exec_script("../../tools/gypi_to_gn.py",
|
| - [rebase_path("builtin_impl_sources.gypi")],
|
| + [ rebase_path("builtin_impl_sources.gypi") ],
|
| "scope",
|
| - ["builtin_impl_sources.gypi"])
|
| + [ "builtin_impl_sources.gypi" ])
|
|
|
| static_library("libdart_builtin") {
|
| - configs += ["..:dart_config",
|
| - "..:dart_maybe_product_config"]
|
| - public_configs = [":libdart_builtin_config"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + ]
|
| + public_configs = [ ":libdart_builtin_config" ]
|
| deps = [
|
| + ":generate_blink_cc_file",
|
| ":generate_builtin_cc_file",
|
| - ":generate_io_cc_file",
|
| - ":generate_io_patch_cc_file",
|
| + ":generate_cached_patches_cc_file",
|
| ":generate_html_cc_file",
|
| ":generate_html_common_cc_file",
|
| + ":generate_indexed_db_cc_file",
|
| + ":generate_io_cc_file",
|
| + ":generate_io_patch_cc_file",
|
| ":generate_js_cc_file",
|
| ":generate_js_util_cc_file",
|
| - ":generate_blink_cc_file",
|
| - ":generate_indexed_db_cc_file",
|
| - ":generate_cached_patches_cc_file",
|
| - ":generate_web_gl_cc_file",
|
| ":generate_metadata_cc_file",
|
| - ":generate_web_sql_cc_file",
|
| ":generate_svg_cc_file",
|
| ":generate_web_audio_cc_file",
|
| + ":generate_web_gl_cc_file",
|
| + ":generate_web_sql_cc_file",
|
| ]
|
| - include_dirs = [
|
| - "..",
|
| - ]
|
| - set_sources_assignment_filter(["*_test.cc", "*_test.h"])
|
| + include_dirs = [ ".." ]
|
| + 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.sources
|
| + "log_android.cc",
|
| + "log_fuchsia.cc",
|
| + "log_linux.cc",
|
| + "log_macos.cc",
|
| + "log_win.cc",
|
| + ] + 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" ])
|
| +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"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + "..:dart_precompiler_config",
|
| + ]
|
| deps = [
|
| ":gen_resources_cc",
|
| ":gen_snapshot_dart_io",
|
| @@ -284,30 +318,29 @@ executable("gen_snapshot") {
|
| ]
|
|
|
| sources = [
|
| + # Include generated source files.
|
| + "$target_gen_dir/builtin_gen.cc",
|
| + "$target_gen_dir/io_gen.cc",
|
| + "$target_gen_dir/io_patch_gen.cc",
|
| + "$target_gen_dir/resources_gen.cc",
|
| "address_sanitizer.cc",
|
| - "gen_snapshot.cc",
|
| + "builtin.cc",
|
| + "builtin.h",
|
| +
|
| # Very limited native resolver provided.
|
| "builtin_common.cc",
|
| "builtin_gen_snapshot.cc",
|
| - "builtin.cc",
|
| - "builtin.h",
|
| + "gen_snapshot.cc",
|
| "vmservice_impl.cc",
|
| "vmservice_impl.h",
|
| - # Include generated source files.
|
| - "$target_gen_dir/builtin_gen.cc",
|
| - "$target_gen_dir/io_gen.cc",
|
| - "$target_gen_dir/io_patch_gen.cc",
|
| - "$target_gen_dir/resources_gen.cc",
|
| ]
|
|
|
| - include_dirs = [
|
| - "..",
|
| - ]
|
| + include_dirs = [ ".." ]
|
|
|
| if (is_mac) {
|
| libs = [
|
| "CoreFoundation.framework",
|
| - "CoreServices.framework"
|
| + "CoreServices.framework",
|
| ]
|
| }
|
|
|
| @@ -325,9 +358,11 @@ executable("gen_snapshot") {
|
| # A source set for the implementation of 'dart:io' library
|
| # (without secure sockets) suitable for linking with gen_snapshot.
|
| source_set("gen_snapshot_dart_io") {
|
| - configs += ["..:dart_config",
|
| - "..:dart_maybe_product_config",
|
| - "..:dart_precompiler_config"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + "..:dart_precompiler_config",
|
| + ]
|
|
|
| deps = [
|
| "$dart_zlib_path",
|
| @@ -359,13 +394,15 @@ source_set("gen_snapshot_dart_io") {
|
|
|
| include_dirs = [
|
| "..",
|
| - "//third_party"
|
| + "//third_party",
|
| ]
|
| }
|
|
|
| source_set("libdart_embedder_noio") {
|
| - configs += ["..:dart_config",
|
| - "..:dart_maybe_product_config"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + ]
|
| deps = [
|
| "..:libdart",
|
| ]
|
| @@ -378,8 +415,10 @@ template("dart_io") {
|
| extra_sources += invoker.extra_sources
|
| }
|
| source_set(target_name) {
|
| - configs += ["..:dart_config",
|
| - "..:dart_maybe_product_config"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + ]
|
| custom_sources_filter = [
|
| "*_test.cc",
|
| "*_test.h",
|
| @@ -403,14 +442,10 @@ template("dart_io") {
|
| ]
|
|
|
| if (is_mac) {
|
| - libs += [
|
| - "CoreServices.framework",
|
| - ]
|
| + libs += [ "CoreServices.framework" ]
|
| }
|
| } else if (defined(is_fuchsia) && is_fuchsia) {
|
| - defines += [
|
| - "DART_IO_SECURE_SOCKET_DISABLED"
|
| - ]
|
| + defines += [ "DART_IO_SECURE_SOCKET_DISABLED" ]
|
| } else {
|
| deps = [
|
| "//third_party/boringssl",
|
| @@ -419,29 +454,27 @@ template("dart_io") {
|
|
|
| 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
|
| + "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
|
|
|
| if (is_linux || is_win) {
|
| if (dart_use_fallback_root_certificates) {
|
| - sources += [ "//third_party/root_certificates/root_certificates.cc"]
|
| + sources += [ "//third_party/root_certificates/root_certificates.cc" ]
|
| } else {
|
| - defines += [
|
| - "DART_IO_ROOT_CERTS_DISABLED",
|
| - ]
|
| + defines += [ "DART_IO_ROOT_CERTS_DISABLED" ]
|
| }
|
| }
|
|
|
| include_dirs = [
|
| "..",
|
| - "//third_party"
|
| + "//third_party",
|
| ]
|
| }
|
| }
|
| @@ -549,31 +582,29 @@ template("dart_executable") {
|
| }
|
| executable(target_name) {
|
| configs += [
|
| - "..:dart_config",
|
| - "..:dart_maybe_product_config"
|
| - ] + extra_configs
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + ] + extra_configs
|
|
|
| deps = [
|
| - ":gen_resources_cc",
|
| - ":standalone_dart_io",
|
| - ":libdart_builtin",
|
| - "$dart_zlib_path",
|
| - ] + extra_deps
|
| + ":gen_resources_cc",
|
| + ":standalone_dart_io",
|
| + ":libdart_builtin",
|
| + "$dart_zlib_path",
|
| + ] + extra_deps
|
|
|
| if (dart_use_tcmalloc) {
|
| - deps += [
|
| - "//third_party/tcmalloc",
|
| - ]
|
| + deps += [ "//third_party/tcmalloc" ]
|
| }
|
|
|
| defines = extra_defines
|
|
|
| sources = [
|
| - "main.cc",
|
| - "vmservice_impl.cc",
|
| - "vmservice_impl.h",
|
| - "$target_gen_dir/resources_gen.cc",
|
| - ] + extra_sources
|
| + "main.cc",
|
| + "vmservice_impl.cc",
|
| + "vmservice_impl.h",
|
| + "$target_gen_dir/resources_gen.cc",
|
| + ] + extra_sources
|
|
|
| include_dirs = [
|
| "..",
|
| @@ -581,13 +612,9 @@ template("dart_executable") {
|
| ]
|
|
|
| if (is_win) {
|
| - ldflags = [
|
| - "/EXPORT:Dart_True"
|
| - ]
|
| + ldflags = [ "/EXPORT:Dart_True" ]
|
| } else {
|
| - ldflags = [
|
| - "-rdynamic",
|
| - ]
|
| + ldflags = [ "-rdynamic" ]
|
| }
|
|
|
| if (is_win) {
|
| @@ -609,29 +636,21 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
|
| ":dart_snapshot_cc",
|
| "../observatory:standalone_observatory_archive",
|
| ]
|
| - extra_sources = [
|
| - "builtin_nolib.cc",
|
| - ]
|
| + extra_sources = [ "builtin_nolib.cc" ]
|
| }
|
|
|
| dart_executable("dart_noopt") {
|
| - extra_configs = [
|
| - "..:dart_precompiler_config",
|
| - ]
|
| + extra_configs = [ "..:dart_precompiler_config" ]
|
| extra_deps = [
|
| "..:libdart_noopt",
|
| ":dart_snapshot_cc",
|
| "../observatory:standalone_observatory_archive",
|
| ]
|
| - extra_sources = [
|
| - "builtin_nolib.cc",
|
| - ]
|
| + extra_sources = [ "builtin_nolib.cc" ]
|
| }
|
|
|
| dart_executable("dart_precompiled_runtime") {
|
| - extra_configs = [
|
| - "..:dart_precompiled_runtime_config"
|
| - ]
|
| + extra_configs = [ "..:dart_precompiled_runtime_config" ]
|
| extra_deps = [
|
| "..:libdart_precompiled_runtime",
|
| "../observatory:standalone_observatory_archive",
|
| @@ -666,14 +685,13 @@ dart_executable("dart_bootstrap") {
|
| ":generate_web_audio_cc_file",
|
| "..:libdart_nosnapshot_with_precompiler",
|
| ]
|
| - extra_defines = [
|
| - "NO_OBSERVATORY",
|
| - ]
|
| + extra_defines = [ "NO_OBSERVATORY" ]
|
| extra_sources = [
|
| "builtin.cc",
|
| "builtin.h",
|
| "observatory_assets_empty.cc",
|
| "snapshot_empty.cc",
|
| +
|
| # Include generated source files.
|
| "$target_gen_dir/builtin_gen.cc",
|
| "$target_gen_dir/io_gen.cc",
|
| @@ -695,15 +713,19 @@ dart_executable("dart_bootstrap") {
|
|
|
| if (defined(is_fuchsia) && is_fuchsia) {
|
| copy("hello_fuchsia") {
|
| - sources = [ "../tests/vm/dart/hello_fuchsia_test.dart" ]
|
| - outputs = [ "$root_out_dir/hello_fuchsia.dart" ]
|
| + sources = [
|
| + "../tests/vm/dart/hello_fuchsia_test.dart",
|
| + ]
|
| + outputs = [
|
| + "$root_out_dir/hello_fuchsia.dart",
|
| + ]
|
| }
|
|
|
| executable("run_vm_tests_fuchsia") {
|
| testonly = true
|
| - configs += ["..:dart_config"]
|
| + configs += [ "..:dart_config" ]
|
| sources = [
|
| - "run_vm_tests_fuchsia.cc"
|
| + "run_vm_tests_fuchsia.cc",
|
| ]
|
| libs = [
|
| "launchpad",
|
| @@ -722,12 +744,8 @@ dart_executable("dart_no_observatory") {
|
| if (defined(is_fuchsia) && is_fuchsia) {
|
| extra_deps += [ ":hello_fuchsia" ]
|
| }
|
| - extra_defines = [
|
| - "NO_OBSERVATORY",
|
| - ]
|
| - extra_sources = [
|
| - "observatory_assets_empty.cc",
|
| - ]
|
| + extra_defines = [ "NO_OBSERVATORY" ]
|
| + extra_sources = [ "observatory_assets_empty.cc" ]
|
| }
|
|
|
| executable("process_test") {
|
| @@ -765,57 +783,57 @@ action("generate_snapshot_test_dat_file") {
|
| }
|
|
|
| executable("run_vm_tests") {
|
| - configs += ["..:dart_config",
|
| - "..:dart_maybe_product_config"]
|
| + configs += [
|
| + "..:dart_config",
|
| + "..:dart_maybe_product_config",
|
| + ]
|
| deps = [
|
| - "..:libdart",
|
| - ":libdart_builtin",
|
| - ":standalone_dart_io",
|
| ":dart_snapshot_cc",
|
| ":generate_snapshot_test_dat_file",
|
| + ":libdart_builtin",
|
| + ":standalone_dart_io",
|
| "$dart_zlib_path",
|
| + "..:libdart",
|
| ]
|
| include_dirs = [
|
| "..",
|
| "$target_gen_dir",
|
| ]
|
| - defines = [
|
| - "TESTING",
|
| - ]
|
| + defines = [ "TESTING" ]
|
|
|
| if (dart_use_tcmalloc) {
|
| - deps += [
|
| - "//third_party/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_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"])
|
| + [
|
| + 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",],
|
| + [
|
| + rebase_path("builtin_impl_sources.gypi"),
|
| + "--keep_only=_test.cc",
|
| + "--keep_only=_test.h",
|
| + ],
|
| "scope",
|
| - ["builtin_impl_sources.gypi"])
|
| + [ "builtin_impl_sources.gypi" ])
|
|
|
| sources = [
|
| - "builtin_nolib.cc",
|
| - "run_vm_tests.cc",
|
| - ] + builtin_impl_tests_list.sources + vm_tests
|
| + "builtin_nolib.cc",
|
| + "run_vm_tests.cc",
|
| + ] + builtin_impl_tests_list.sources + vm_tests
|
|
|
| if (!is_win) {
|
| - ldflags = [
|
| - "-rdynamic",
|
| - ]
|
| + ldflags = [ "-rdynamic" ]
|
| }
|
|
|
| if (is_win) {
|
| @@ -838,21 +856,15 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
|
| "test_extension.c",
|
| "test_extension_dllmain_win.cc",
|
| ]
|
| - include_dirs = [
|
| - "..",
|
| - ]
|
| + include_dirs = [ ".." ]
|
| defines = [
|
| # The only effect of DART_SHARED_LIB is to export the Dart API.
|
| "DART_SHARED_LIB",
|
| ]
|
| if (is_win) {
|
| - libs = [
|
| - "dart.lib"
|
| - ]
|
| + libs = [ "dart.lib" ]
|
| abs_root_out_dir = rebase_path(root_out_dir)
|
| - ldflags = [
|
| - "/LIBPATH:$abs_root_out_dir"
|
| - ]
|
| + ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| }
|
| }
|
|
|
| @@ -864,21 +876,15 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
|
| "../../samples/sample_extension/sample_extension.cc",
|
| "../../samples/sample_extension/sample_extension_dllmain_win.cc",
|
| ]
|
| - include_dirs = [
|
| - "..",
|
| - ]
|
| + include_dirs = [ ".." ]
|
| defines = [
|
| # The only effect of DART_SHARED_LIB is to export the Dart API.
|
| "DART_SHARED_LIB",
|
| ]
|
| if (is_win) {
|
| - libs = [
|
| - "dart.lib"
|
| - ]
|
| + libs = [ "dart.lib" ]
|
| abs_root_out_dir = rebase_path(root_out_dir)
|
| - ldflags = [
|
| - "/LIBPATH:$abs_root_out_dir"
|
| - ]
|
| + ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| }
|
| }
|
| }
|
|
|