1
0
mirror of https://github.com/dart-lang/sdk synced 2024-07-03 00:08:46 +00:00

[BUILD] - Format gn files, this is being done to ensure the unfork CL

doesn't show these formatting changes as diffs.

Change-Id: I69ccbf4adabc66d88371cece785a2c1bce60f133
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138962
Reviewed-by: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
asiva 2020-03-10 21:56:11 +00:00 committed by Siva Annamalai
parent 2397862762
commit e33d023fa0
51 changed files with 266 additions and 554 deletions

View File

@ -13,9 +13,7 @@ group("default") {
# Fuchsia has run_vm_tests marked testonly.
testonly = true
}
deps = [
":runtime",
]
deps = [ ":runtime" ]
if (defined(checkout_llvm) && checkout_llvm) {
deps += [ ":llvm_codegen" ]
}
@ -66,9 +64,7 @@ group("runtime_kernel") {
# Fuchsia has run_vm_tests marked testonly.
testonly = true
}
deps = [
":runtime",
]
deps = [ ":runtime" ]
}
group("runtime_precompiled") {
@ -80,59 +76,41 @@ group("runtime_precompiled") {
if (use_nnbd) {
group("create_sdk") {
public_deps = [
"sdk_nnbd:create_sdk",
]
public_deps = [ "sdk_nnbd:create_sdk" ]
}
} else {
group("create_sdk") {
public_deps = [
"sdk:create_sdk",
]
public_deps = [ "sdk:create_sdk" ]
}
}
group("dart2js") {
deps = [
"utils/compiler:dart2js",
]
deps = [ "utils/compiler:dart2js" ]
}
group("dartanalyzer") {
deps = [
"utils/dartanalyzer",
]
deps = [ "utils/dartanalyzer" ]
}
group("dartdevc") {
deps = [
"utils/dartdevc",
]
deps = [ "utils/dartdevc" ]
}
group("dartfmt") {
deps = [
"utils/dartfmt",
]
deps = [ "utils/dartfmt" ]
}
group("dartfix") {
deps = [
"utils/dartfix",
]
deps = [ "utils/dartfix" ]
}
group("analysis_server") {
deps = [
"utils/analysis_server",
]
deps = [ "utils/analysis_server" ]
}
group("check_llvm") {
if (defined(checkout_llvm) && checkout_llvm) {
deps = [
"runtime/llvm_codegen/test",
]
deps = [ "runtime/llvm_codegen/test" ]
}
}
@ -149,15 +127,11 @@ group("llvm_codegen") {
# It must depend on anything that is required by the dart2js
# test suites.
group("dart2js_bot") {
deps = [
":create_sdk",
]
deps = [ ":create_sdk" ]
}
group("samples") {
deps = [
"runtime/bin:sample_extension",
]
deps = [ "runtime/bin:sample_extension" ]
}
# This rule and the compressed_observatory_archive rule are for the Fuchsia
@ -165,13 +139,9 @@ group("samples") {
# the root build output directory for convenient access by the Fuchsia buildbot
# scripts.
group("observatory_archive") {
deps = [
"runtime/observatory:copy_observatory_archive",
]
deps = [ "runtime/observatory:copy_observatory_archive" ]
}
group("compressed_observatory_archive") {
deps = [
"runtime/observatory:copy_compressed_observatory_archive",
]
deps = [ "runtime/observatory:copy_compressed_observatory_archive" ]
}

View File

@ -8,9 +8,8 @@ import("//build/config/sysroot.gni")
config("sdk") {
if (sysroot != "") {
cflags = [ "--sysroot=" + sysroot ]
ldflags = [
"--sysroot=" + rebase_path("$android_ndk_root/$android_sysroot_subdir"),
]
ldflags = [ "--sysroot=" +
rebase_path("$android_ndk_root/$android_sysroot_subdir") ]
# Need to get some linker flags out of the sysroot.
sysroot_ld_path = rebase_path("//build/config/linux/sysroot_ld_path.py")

View File

@ -12,17 +12,13 @@ template("code_sign_mac") {
assert(defined(invoker.deps))
action(target_name) {
sources = [
invoker.entitlements_path,
]
sources = [ invoker.entitlements_path ]
_application_path = invoker.application_path
script = mac_app_script
outputs = [
"$_application_path/_CodeSignature/CodeResources",
]
outputs = [ "$_application_path/_CodeSignature/CodeResources" ]
args = [
"codesign",
@ -50,9 +46,7 @@ template("process_nibs_mac") {
invoker_out_dir = invoker.output_dir
outputs = [
"$root_build_dir/$invoker_out_dir/{{source_name_part}}.nib",
]
outputs = [ "$root_build_dir/$invoker_out_dir/{{source_name_part}}.nib" ]
args = [
"nib",
@ -80,9 +74,7 @@ template("resource_copy_mac") {
copy(target_name) {
set_sources_assignment_filter([])
sources = _resources
outputs = [
"$root_build_dir/$_app_name.app/$_bundle_directory/Contents/Resources/{{source_file_part}}",
]
outputs = [ "$root_build_dir/$_app_name.app/$_bundle_directory/Contents/Resources/{{source_file_part}}" ]
if (defined(invoker.deps)) {
deps = invoker.deps
@ -116,9 +108,7 @@ template("mac_app") {
script = mac_app_script
sources = []
outputs = [
"$root_build_dir/$app_name.app",
]
outputs = [ "$root_build_dir/$app_name.app" ]
args = [
"structure",
@ -145,12 +135,8 @@ template("mac_app") {
action(plist_gen_target_name) {
script = mac_app_script
sources = [
invoker.info_plist,
]
outputs = [
"$root_build_dir/plist/$app_name/Info.plist",
]
sources = [ invoker.info_plist ]
outputs = [ "$root_build_dir/plist/$app_name/Info.plist" ]
args = [
"plist",
@ -165,32 +151,21 @@ template("mac_app") {
copy_plist_gen_target_name = target_name + "_plist_copy"
copy(copy_plist_gen_target_name) {
sources = [
"$root_build_dir/plist/$app_name/Info.plist",
]
sources = [ "$root_build_dir/plist/$app_name/Info.plist" ]
outputs = [
"$root_build_dir/$app_name.app/Contents/{{source_file_part}}",
]
outputs = [ "$root_build_dir/$app_name.app/Contents/{{source_file_part}}" ]
deps = [
":$plist_gen_target_name",
]
deps = [ ":$plist_gen_target_name" ]
}
copy_bin_target_name = target_name + "_bin_copy"
copy(copy_bin_target_name) {
sources = [
"$root_build_dir/$app_name",
]
sources = [ "$root_build_dir/$app_name" ]
outputs = [
"$root_build_dir/$app_name.app/Contents/MacOS/{{source_file_part}}",
]
outputs =
[ "$root_build_dir/$app_name.app/Contents/MacOS/{{source_file_part}}" ]
deps = [
":$bin_gen_target_name",
]
deps = [ ":$bin_gen_target_name" ]
}
copy_xib_target_name = target_name + "_xib_copy"
@ -213,8 +188,6 @@ template("mac_app") {
# Top level group
group(target_name) {
deps = [
":$copy_all_target_name",
]
deps = [ ":$copy_all_target_name" ]
}
}

View File

@ -8,9 +8,7 @@ import("//build/config/sanitizers/sanitizers.gni")
# shared_libraries. Unconditionally depend upon this target as it is empty if
# |is_asan|, |is_lsan|, |is_tsan|, |is_msan| and |use_custom_libcxx| are false.
group("deps") {
deps = [
"//third_party/instrumented_libraries:deps",
]
deps = [ "//third_party/instrumented_libraries:deps" ]
if (is_asan || is_lsan || is_msan || is_tsan || is_ubsan) {
public_configs = [ ":sanitizer_options_link_helper" ]
deps += [ ":options_sources" ]
@ -44,9 +42,7 @@ source_set("options_sources") {
":deps",
"//:gn_visibility",
]
sources = [
"//build/sanitizers/sanitizer_options.cc",
]
sources = [ "//build/sanitizers/sanitizer_options.cc" ]
if (is_asan) {
sources += [ "//build/sanitizers/asan_suppressions.cc" ]

View File

@ -16,13 +16,17 @@ declare_args() {
if (is_linux && dart_use_debian_sysroot) {
if (current_cpu == "x86") {
target_sysroot = rebase_path("//build/linux/debian_jessie_i386-sysroot", root_build_dir)
target_sysroot =
rebase_path("//build/linux/debian_jessie_i386-sysroot", root_build_dir)
} else if (current_cpu == "x64") {
target_sysroot = rebase_path("//build/linux/debian_jessie_amd64-sysroot", root_build_dir)
target_sysroot =
rebase_path("//build/linux/debian_jessie_amd64-sysroot", root_build_dir)
} else if (current_cpu == "arm") {
target_sysroot = rebase_path("//build/linux/debian_jessie_arm-sysroot", root_build_dir)
target_sysroot =
rebase_path("//build/linux/debian_jessie_arm-sysroot", root_build_dir)
} else if (current_cpu == "arm64") {
target_sysroot = rebase_path("//build/linux/debian_jessie_arm64-sysroot", root_build_dir)
target_sysroot =
rebase_path("//build/linux/debian_jessie_arm64-sysroot", root_build_dir)
} else {
print("There is no Debian sysroot present for $current_cpu")
assert(false)

View File

@ -38,9 +38,7 @@ template("file_template") {
script = "//build/android/gyp/jinja_template.py"
depfile = "$target_gen_dir/$target_name.d"
sources = [
invoker.input,
]
sources = [ invoker.input ]
outputs = [
invoker.output,
depfile,

View File

@ -74,14 +74,14 @@ template("copy_trees") {
foreach(copy_tree_spec, sources) {
copy_tree_source_paths += [
rebase_path(copy_tree_spec.source),
copy_tree_spec.ignore_patterns
copy_tree_spec.ignore_patterns,
]
}
# Evaluate script output as GN, producing a scope containing a single value
# "sources"
copy_tree_inputs_scope = exec_script("$_dart_root/tools/copy_tree.py",
["--gn"] + copy_tree_source_paths,
[ "--gn" ] + copy_tree_source_paths,
"scope")
# A list of lists of input source files for copy_tree.

View File

@ -74,9 +74,7 @@ template("_compiled_action") {
# Add the executable itself as an input.
inputs += [ host_executable ]
deps = [
host_tool,
]
deps = [ host_tool ]
if (defined(invoker.deps)) {
deps += invoker.deps
}

View File

@ -12,7 +12,12 @@ _prebuilt_dart_exe =
# When the first argument is "exec_script", gn_run_binary.py always exits with
# status 0, but gives non-empty output when the command it is given fails.
_prebuilt_dart_exe_trial = exec_script("../gn_run_binary.py",
["exec_script", _prebuilt_dart_exe, "--version"], "string")
[
"exec_script",
_prebuilt_dart_exe,
"--version",
],
"string")
if (_prebuilt_dart_exe_trial == "") {
prebuilt_dart_exe_works = true
} else {

View File

@ -11,8 +11,10 @@ template("rust_library") {
cmd = [
rebase_path("//buildtools/${current_os}-${current_cpu}/rust/bin/cargo"),
"build",
"--target-dir", rebase_path(target_out_dir),
"--manifest-path", manifest,
"--target-dir",
rebase_path(target_out_dir),
"--manifest-path",
manifest,
]
output = "$target_out_dir/lib${invoker.lib_name}.a"
debug = defined(invoker.debug) && invoker.debug

View File

@ -6,19 +6,13 @@ if (is_linux && !is_chromeos) {
# TODO(GYP): Figure out which of these work and are needed on other platforms.
copy("copy_llvm_symbolizer") {
if (is_win) {
sources = [
"//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe",
]
outputs = [
"$root_out_dir/llvm-symbolizer.exe",
]
sources =
[ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe" ]
outputs = [ "$root_out_dir/llvm-symbolizer.exe" ]
} else {
sources = [
"//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
]
outputs = [
"$root_out_dir/llvm-symbolizer",
]
sources =
[ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
outputs = [ "$root_out_dir/llvm-symbolizer" ]
}
}
}

View File

@ -16,13 +16,12 @@ config("cpu_features_warnings") {
}
source_set("cpu_features") {
sources = [
"$android_ndk_root/sources/android/cpufeatures/cpu-features.c",
]
sources = [ "$android_ndk_root/sources/android/cpufeatures/cpu-features.c" ]
public_configs = [ ":cpu_features_include" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
# Must be after no_chromium_code for warning flags to be ordered correctly.
":cpu_features_warnings",
]

View File

@ -4,8 +4,8 @@
import("//build/config/sysroot.gni") # Imports android/config.gni.
import("//build/toolchain/ccache.gni")
import("//build/toolchain/goma.gni")
import("//build/toolchain/gcc_toolchain.gni")
import("//build/toolchain/goma.gni")
# The Android GCC toolchains share most of the same parameters, so we have this
# wrapper around gcc_toolchain to avoid duplication of logic.

View File

@ -101,9 +101,8 @@ template("gcc_toolchain") {
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "CC {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("cxx") {
@ -111,9 +110,8 @@ template("gcc_toolchain") {
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "CXX {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("asm") {
@ -122,9 +120,8 @@ template("gcc_toolchain") {
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "ASM {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("alink") {
@ -132,9 +129,8 @@ template("gcc_toolchain") {
command = "rm -f {{output}} && $ar rcs {{output}} @$rspfile"
description = "AR {{output}}"
rspfile_content = "{{inputs}}"
outputs = [
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}",
]
outputs =
[ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ]
default_output_extension = ".a"
output_prefix = "lib"
}
@ -208,8 +204,7 @@ template("gcc_toolchain") {
command += " && " + strip_command
} else if (defined(invoker.llvm_objcopy)) {
strip = invoker.llvm_objcopy
strip_command =
"${strip} --strip-all $outfile $stripped_outfile"
strip_command = "${strip} --strip-all $outfile $stripped_outfile"
command += " && " + strip_command
}
if (defined(invoker.postlink)) {
@ -217,9 +212,7 @@ template("gcc_toolchain") {
}
description = "LINK $outfile"
rspfile_content = "{{inputs}}"
outputs = [
outfile,
]
outputs = [ outfile ]
if (defined(invoker.strip) || defined(invoker.llvm_objcopy)) {
outputs += [ stripped_outfile ]
}

View File

@ -6,13 +6,13 @@
# some enhancements since the commands on Mac are slightly different than on
# Linux.
import("../goma.gni")
import("//build/config/mac/mac_sdk.gni")
import("../goma.gni")
assert(host_os == "mac")
import("//build/toolchain/goma.gni")
import("//build/config/sysroot.gni")
import("//build/toolchain/goma.gni")
if (use_goma) {
goma_prefix = "$goma_dir/gomacc "
@ -61,9 +61,8 @@ template("mac_toolchain") {
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} $sysroot_flags $toolchain_flags {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "CC {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("cxx") {
@ -71,9 +70,8 @@ template("mac_toolchain") {
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} $sysroot_flags $toolchain_flags {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "CXX {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("asm") {
@ -82,9 +80,8 @@ template("mac_toolchain") {
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} $sysroot_flags $toolchain_flags {{asmflags}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "ASM {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("objc") {
@ -92,9 +89,8 @@ template("mac_toolchain") {
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} $sysroot_flags $toolchain_flags {{cflags}} {{cflags_c}} {{cflags_objc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "OBJC {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("objcxx") {
@ -102,9 +98,8 @@ template("mac_toolchain") {
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} $sysroot_flags $toolchain_flags {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "OBJCXX {{output}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
]
outputs =
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
}
tool("alink") {
@ -112,15 +107,15 @@ template("mac_toolchain") {
command = "rm -f {{output}} && $ar rcs {{output}} @$rspfile"
description = "AR {{output}}"
rspfile_content = "{{inputs}}"
outputs = [
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}",
]
outputs =
[ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ]
default_output_extension = ".a"
output_prefix = "lib"
}
tool("solink") {
dylib = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" # eg "./libfoo.dylib"
dylib = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" # eg
# "./libfoo.dylib"
rspfile = dylib + ".rsp"
# These variables are not build into GN but are helpers that implement
@ -185,9 +180,7 @@ template("mac_toolchain") {
description = "LINK $outfile"
rspfile_content = "{{inputs_newline}}"
outputs = [
outfile,
]
outputs = [ outfile ]
if (defined(invoker.strip)) {
outputs += [ stripped_outfile ]
}

View File

@ -138,9 +138,10 @@ template("msvc_toolchain") {
}
tool("solink") {
dllname = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" # e.g. foo.dll
libname =
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}.lib" # e.g. foo.dll.lib
dllname = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" # e.g.
# foo.dll
libname = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.lib" # e.g.
# foo.dll.lib
rspfile = "${dllname}.rsp"
link_command = "$python_path $tool_wrapper_path link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
@ -165,7 +166,9 @@ template("msvc_toolchain") {
}
tool("solink_module") {
dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" # e.g. foo.dll
dllname =
"{{output_dir}}/{{target_output_name}}{{output_extension}}" # e.g.
# foo.dll
pdbname = "${dllname}.pdb"
rspfile = "${dllname}.rsp"

View File

@ -55,9 +55,7 @@ action("pkg_files_stamp") {
inputs = stamp0_outputs + stamp1_outputs + stamp2_outputs + stamp3_outputs
outputs = [
"$root_gen_dir/pkg_files.stamp",
]
outputs = [ "$root_gen_dir/pkg_files.stamp" ]
script = "../tools/create_timestamp_file.py"
args = [ rebase_path("$root_gen_dir/pkg_files.stamp") ]

View File

@ -211,8 +211,8 @@ source_set("dart_api") {
library_for_all_configs("libdart") {
target_type = dart_component_kind
extra_deps = [
"third_party/double-conversion/src:libdouble_conversion",
":generate_version_cc_file",
"third_party/double-conversion/src:libdouble_conversion",
]
if (dart_enable_wasm) {
extra_deps += [ "//third_party/wasmer" ]
@ -260,9 +260,7 @@ action("generate_version_cc_file") {
inputs += [ "$default_git_folder/logs/HEAD" ]
}
output = "$target_gen_dir/version.cc"
outputs = [
output,
]
outputs = [ output ]
script = "../tools/make_version.py"
args = [

View File

@ -43,13 +43,9 @@ template("build_libdart_builtin") {
deps = []
if (is_fuchsia) {
if (using_fuchsia_sdk) {
public_deps = [
"$fuchsia_sdk_root/pkg:fdio",
]
public_deps = [ "$fuchsia_sdk_root/pkg:fdio" ]
} else {
public_deps = [
"//zircon/public/lib/fdio",
]
public_deps = [ "//zircon/public/lib/fdio" ]
}
}
include_dirs = [ ".." ]
@ -106,9 +102,7 @@ static_library("crashpad") {
"..:dart_os_fuchsia_config",
]
include_dirs = [ ".." ]
sources = [
"crashpad.cc",
]
sources = [ "crashpad.cc" ]
if (dart_use_crashpad) {
assert(is_win, "dart_use_crashpad is only supported on Windows")
@ -142,15 +136,11 @@ template("build_elf_loader") {
}
build_elf_loader("elf_loader") {
deps = [
":libdart_builtin",
]
deps = [ ":libdart_builtin" ]
}
build_elf_loader("elf_loader_product") {
deps = [
":libdart_builtin_product",
]
deps = [ ":libdart_builtin_product" ]
}
template("build_gen_snapshot") {
@ -241,8 +231,8 @@ build_gen_snapshot("gen_snapshot") {
extra_deps = [
":gen_snapshot_dart_io",
":libdart_builtin",
"../platform:libdart_platform_precompiler",
"..:libdart_precompiler",
"../platform:libdart_platform_precompiler",
]
}
@ -255,8 +245,8 @@ build_gen_snapshot("gen_snapshot_product") {
extra_deps = [
":gen_snapshot_dart_io_product",
":libdart_builtin_product",
"../platform:libdart_platform_precompiler_product",
"..:libdart_precompiler_product",
"../platform:libdart_platform_precompiler_product",
]
}
@ -269,8 +259,8 @@ build_gen_snapshot("gen_snapshot_fuchsia") {
extra_deps = [
":gen_snapshot_dart_io_fuchsia",
":libdart_builtin_fuchsia",
"../platform:libdart_platform_precompiler_fuchsia",
"..:libdart_precompiler_fuchsia",
"../platform:libdart_platform_precompiler_fuchsia",
]
}
@ -283,8 +273,8 @@ build_gen_snapshot("gen_snapshot_product_fuchsia") {
extra_deps = [
":gen_snapshot_dart_io_product_fuchsia",
":libdart_builtin_product_fuchsia",
"../platform:libdart_platform_precompiler_product_fuchsia",
"..:libdart_precompiler_product_fuchsia",
"../platform:libdart_platform_precompiler_product_fuchsia",
]
}
@ -293,8 +283,8 @@ build_gen_snapshot("gen_snapshot_host_targeting_host") {
extra_deps = [
":gen_snapshot_dart_io_host_targeting_host",
":libdart_builtin_host_targeting_host",
"../platform:libdart_platform_precompiler_host_targeting_host",
"..:libdart_precompiler_host_targeting_host",
"../platform:libdart_platform_precompiler_host_targeting_host",
]
}
@ -303,8 +293,8 @@ build_gen_snapshot("gen_snapshot_product_host_targeting_host") {
extra_deps = [
":gen_snapshot_dart_io_host_targeting_host",
":libdart_builtin_host_targeting_host",
"../platform:libdart_platform_precompiler_host_targeting_host",
"..:libdart_precompiler_host_targeting_host",
"../platform:libdart_platform_precompiler_host_targeting_host",
]
}
@ -328,17 +318,13 @@ template("build_gen_snapshot_dart_io") {
"$fuchsia_sdk_root/fidl:fuchsia.netstack",
"$fuchsia_sdk_root/pkg:sys_cpp",
]
public_deps = [
"$fuchsia_sdk_root/pkg:fdio",
]
public_deps = [ "$fuchsia_sdk_root/pkg:fdio" ]
} else {
deps += [
"//sdk/fidl/fuchsia.netstack",
"//sdk/lib/sys/cpp",
]
public_deps = [
"//zircon/public/lib/fdio",
]
public_deps = [ "//zircon/public/lib/fdio" ]
}
}
@ -468,17 +454,13 @@ template("dart_io") {
"$fuchsia_sdk_root/fidl:fuchsia.netstack",
"$fuchsia_sdk_root/pkg:sys_cpp",
]
public_deps = [
"$fuchsia_sdk_root/pkg:fdio",
]
public_deps = [ "$fuchsia_sdk_root/pkg:fdio" ]
} else {
deps += [
"//sdk/fidl/fuchsia.netstack",
"//sdk/lib/sys/cpp",
]
public_deps = [
"//zircon/public/lib/fdio",
]
public_deps = [ "//zircon/public/lib/fdio" ]
}
}
@ -507,9 +489,9 @@ template("dart_io") {
dart_io("dart_io_api") {
extra_configs = [ "..:dart_maybe_product_config" ]
extra_sources = [
"../include/bin/dart_io_api.h",
"builtin.cc",
"dart_io_api_impl.cc",
"../include/bin/dart_io_api.h",
]
extra_deps = [ ":libdart_builtin" ]
}
@ -517,9 +499,9 @@ dart_io("dart_io_api") {
dart_io("dart_io_api_product") {
extra_configs = [ "..:dart_product_config" ]
extra_sources = [
"../include/bin/dart_io_api.h",
"builtin.cc",
"dart_io_api_impl.cc",
"../include/bin/dart_io_api.h",
]
extra_deps = [ ":libdart_builtin_product" ]
}
@ -531,9 +513,7 @@ dart_io("standalone_dart_io") {
}
gen_snapshot_action("generate_snapshot_bin") {
deps = [
"../vm:vm_platform_stripped",
]
deps = [ "../vm:vm_platform_stripped" ]
vm_snapshot_data = "$target_gen_dir/vm_snapshot_data.bin"
vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
isolate_snapshot_data = "$target_gen_dir/isolate_snapshot_data.bin"
@ -541,9 +521,7 @@ gen_snapshot_action("generate_snapshot_bin") {
"$target_gen_dir/isolate_snapshot_instructions.bin"
platform_dill = "$root_out_dir/vm_platform_strong_stripped.dill"
inputs = [
platform_dill,
]
inputs = [ platform_dill ]
outputs = [
vm_snapshot_data,
vm_snapshot_instructions,
@ -602,12 +580,8 @@ template("bin_to_assembly") {
if (invoker.executable) {
args += [ "--executable" ]
}
inputs = [
invoker.input,
]
outputs = [
output,
]
inputs = [ invoker.input ]
outputs = [ output ]
}
}
@ -646,12 +620,8 @@ template("bin_to_coff") {
if (current_cpu == "x64") {
args += [ "--64-bit" ]
}
inputs = [
invoker.input,
]
outputs = [
output,
]
inputs = [ invoker.input ]
outputs = [ output ]
}
}
@ -670,45 +640,35 @@ template("bin_to_linkable") {
}
bin_to_linkable("vm_snapshot_data_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/vm_snapshot_data.bin"
symbol = "kDartVmSnapshotData"
executable = false
}
bin_to_linkable("vm_snapshot_instructions_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/vm_snapshot_instructions.bin"
symbol = "kDartVmSnapshotInstructions"
executable = true
}
bin_to_linkable("isolate_snapshot_data_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/isolate_snapshot_data.bin"
symbol = "kDartCoreIsolateSnapshotData"
executable = false
}
bin_to_linkable("isolate_snapshot_instructions_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/isolate_snapshot_instructions.bin"
symbol = "kDartCoreIsolateSnapshotInstructions"
executable = true
}
bin_to_linkable("kernel_service_dill_linkable") {
deps = [
"../../utils/kernel-service:kernel_service_dill",
]
deps = [ "../../utils/kernel-service:kernel_service_dill" ]
input = "$root_gen_dir/kernel_service.dill"
symbol = "kKernelServiceDill"
size_symbol = "kKernelServiceDillSize"
@ -716,9 +676,7 @@ bin_to_linkable("kernel_service_dill_linkable") {
}
bin_to_linkable("platform_strong_dill_linkable") {
deps = [
"../vm:vm_platform",
]
deps = [ "../vm:vm_platform" ]
input = "$root_out_dir/vm_platform_strong.dill"
symbol = "kPlatformStrongDill"
size_symbol = "kPlatformStrongDillSize"
@ -758,9 +716,7 @@ action("generate_abi_version_cc_file") {
"abi_version_in.cc",
]
output = "$target_gen_dir/abi_version.cc"
outputs = [
output,
]
outputs = [ output ]
script = "../../tools/make_version.py"
args = [
@ -878,9 +834,9 @@ template("dart_executable") {
dart_executable("dart") {
extra_deps = [
":dart_snapshot_cc",
"..:libdart_jit",
"../platform:libdart_platform_jit",
":dart_snapshot_cc",
]
if (dart_runtime_mode != "release") {
extra_deps += [ "../observatory:standalone_observatory_archive" ]
@ -930,22 +886,16 @@ dart_executable("dart_precompiled_runtime") {
}
executable("process_test") {
sources = [
"process_test.cc",
]
sources = [ "process_test.cc" ]
}
prebuilt_dart_action("gen_kernel_bytecode_dill") {
deps = [
"../vm:vm_platform",
]
deps = [ "../vm:vm_platform" ]
platform_dill = "$root_out_dir/vm_platform_strong.dill"
output = "$root_out_dir/gen_kernel_bytecode.dill"
depfile = "$target_gen_dir/gen_kernel_bytecode.dill.d"
outputs = [
output,
]
outputs = [ output ]
script = "../../pkg/vm/bin/gen_kernel.dart"
@ -1059,9 +1009,7 @@ executable("run_vm_tests") {
}
shared_library("test_extension") {
deps = [
":dart",
]
deps = [ ":dart" ]
sources = [
"test_extension.c",
"test_extension_dllmain_win.cc",
@ -1082,9 +1030,7 @@ shared_library("test_extension") {
}
shared_library("entrypoints_verification_test_extension") {
deps = [
":dart",
]
deps = [ ":dart" ]
sources = [
"entrypoints_verification_test_extension.cc",
"entrypoints_verification_test_extension_dllmain_win.cc",
@ -1105,12 +1051,8 @@ shared_library("entrypoints_verification_test_extension") {
}
shared_library("ffi_test_dynamic_library") {
deps = [
":dart",
]
sources = [
"ffi_test/ffi_test_dynamic_library.cc",
]
deps = [ ":dart" ]
sources = [ "ffi_test/ffi_test_dynamic_library.cc" ]
include_dirs = [ ".." ]
defines = [
# The only effect of DART_SHARED_LIB is to export the Dart API.
@ -1128,9 +1070,7 @@ shared_library("ffi_test_dynamic_library") {
}
shared_library("ffi_test_functions") {
deps = [
":dart",
]
deps = [ ":dart" ]
# The two files here do not depend on each other.
# flutter/flutter integration tests will only use `ffi_test_functions.cc` -
@ -1162,9 +1102,7 @@ shared_library("ffi_test_functions") {
}
shared_library("sample_extension") {
deps = [
":dart",
]
deps = [ ":dart" ]
sources = [
"../../samples/sample_extension/sample_extension.cc",
"../../samples/sample_extension/sample_extension_dllmain_win.cc",

View File

@ -15,10 +15,10 @@ builtin_impl_sources = [
"crypto_linux.cc",
"crypto_macos.cc",
"crypto_win.cc",
"dartutils.cc",
"dartutils.h",
"dartdev_utils.cc",
"dartdev_utils.h",
"dartutils.cc",
"dartutils.h",
"directory.cc",
"directory.h",
"directory_android.cc",
@ -26,10 +26,10 @@ builtin_impl_sources = [
"directory_linux.cc",
"directory_macos.cc",
"directory_win.cc",
"exe_utils.h",
"exe_utils.cc",
"extensions.h",
"exe_utils.h",
"extensions.cc",
"extensions.h",
"extensions_android.cc",
"extensions_fuchsia.cc",
"extensions_linux.cc",

View File

@ -104,6 +104,6 @@ io_impl_sources = [
"sync_socket_linux.cc",
"sync_socket_macos.cc",
"sync_socket_win.cc",
"typed_data_utils.h",
"typed_data_utils.cc",
"typed_data_utils.h",
]

View File

@ -3,27 +3,19 @@
# BSD-style license that can be found in the LICENSE file.
executable("bit") {
sources = [
"main.cc",
]
sources = [ "main.cc" ]
root_dir = rebase_path(root_out_dir)
clang_dir = rebase_path("//buildtools/linux-x64/clang/bin")
defines = [
"BIT_BINARY_DIR=\"$root_dir\"",
"BIT_CLANG_DIR=\"$clang_dir\"",
]
deps = [
"../../../third_party/llvm:LLVMSupport",
]
data_deps = [
"../codegen",
]
deps = [ "../../../third_party/llvm:LLVMSupport" ]
data_deps = [ "../codegen" ]
}
source_set("test") {
sources = [
"test.cc",
]
sources = [ "test.cc" ]
root_dir = rebase_path(root_out_dir)
clang_dir = rebase_path("//buildtools/linux-x64/clang/bin")
@ -32,9 +24,7 @@ source_set("test") {
"BIT_CLANG_DIR=\"$clang_dir\"",
]
deps = [
"../../../third_party/llvm:LLVMSupport",
]
deps = [ "../../../third_party/llvm:LLVMSupport" ]
include_dirs = [ "//runtime" ]

View File

@ -18,12 +18,8 @@ config("llvm") {
}
copy("lib_llvm") {
sources = [
_lib_llvm_so,
]
outputs = [
"$root_out_dir/libLLVM-9svn.so",
]
sources = [ _lib_llvm_so ]
outputs = [ "$root_out_dir/libLLVM-9svn.so" ]
public_configs = [ ":llvm" ]
}

View File

@ -4,7 +4,7 @@
group("test") {
deps = [
"codegen",
"bit",
"codegen",
]
}

View File

@ -21,21 +21,18 @@ template("bit_test") {
script = "//runtime/llvm_codegen/test/run_bit.py"
sources = invoker.tests
deps = [
"../../bit",
]
inputs = [
"${root_out_dir}/bit$executable_suffix",
]
deps = [ "../../bit" ]
inputs = [ "${root_out_dir}/bit$executable_suffix" ]
# This output is always dirty so ninja will always run this step when asked to.
outputs = [
"$target_gen_dir/{{source_name_part}}}",
]
outputs = [ "$target_gen_dir/{{source_name_part}}}" ]
args = [
"--bit", rebase_path("${root_out_dir}/bit"),
"--test", "{{source}}",
"--out", rebase_path(target_gen_dir),
"--bit",
rebase_path("${root_out_dir}/bit"),
"--test",
"{{source}}",
"--out",
rebase_path(target_gen_dir),
]
}
}

View File

@ -16,9 +16,7 @@ prebuilt_dart2js_action("build_observatory") {
inputs = [ ".packages" ] + observatory_sources
output = "$target_gen_dir/observatory/web/main.dart.js"
outputs = [
output,
]
outputs = [ output ]
if (is_debug) {
outputs += [ "$target_gen_dir/observatory/web/main.dart.js.map" ]
}
@ -159,18 +157,12 @@ copy_trees("copy_observatory_packages") {
copy("copy_main_dart_js") {
visibility = [ ":deploy_observatory" ]
deps = [
":build_observatory",
]
sources = [
"$target_gen_dir/observatory/web/main.dart.js",
]
deps = [ ":build_observatory" ]
sources = [ "$target_gen_dir/observatory/web/main.dart.js" ]
if (is_debug) {
sources += [ "$target_gen_dir/observatory/web/main.dart.js.map" ]
}
outputs = [
"$target_out_dir/observatory/deployed/web/{{source_file_part}}",
]
outputs = [ "$target_out_dir/observatory/deployed/web/{{source_file_part}}" ]
}
group("deploy_observatory") {
@ -190,16 +182,12 @@ template("observatory_archive") {
enable_compression = true
}
action(target_name) {
deps = [
":deploy_observatory",
]
deps = [ ":deploy_observatory" ]
output_name = target_name
output = "$target_gen_dir/${output_name}.tar"
outputs = [
output,
]
outputs = [ output ]
script = "../tools/create_archive.py"
args = [
@ -220,18 +208,12 @@ observatory_archive("compressed_observatory_archive") {
copy("copy_compressed_observatory_archive") {
archive_target = ":compressed_observatory_archive"
deps = [
archive_target,
]
deps = [ archive_target ]
archive_dir = get_label_info(archive_target, "target_gen_dir")
archive_name = get_label_info(archive_target, "name")
archive_file = "${archive_dir}/${archive_name}.tar"
sources = [
archive_file,
]
outputs = [
"$root_out_dir/${archive_name}.tar",
]
sources = [ archive_file ]
outputs = [ "$root_out_dir/${archive_name}.tar" ]
}
observatory_archive("observatory_archive") {
@ -240,18 +222,12 @@ observatory_archive("observatory_archive") {
copy("copy_observatory_archive") {
archive_target = ":observatory_archive"
deps = [
archive_target,
]
deps = [ archive_target ]
archive_dir = get_label_info(archive_target, "target_gen_dir")
archive_name = get_label_info(archive_target, "name")
archive_file = "${archive_dir}/${archive_name}.tar"
sources = [
archive_file,
]
outputs = [
"$root_out_dir/${archive_name}.tar",
]
sources = [ archive_file ]
outputs = [ "$root_out_dir/${archive_name}.tar" ]
}
# Generates a .cc file containing the bytes of the observatory archive in a C
@ -277,14 +253,10 @@ template("observatory_archive_source") {
action(target_name) {
forward_variables_from(invoker, [ "deps" ])
inputs = [
invoker.archive_file,
]
inputs = [ invoker.archive_file ]
output = "$target_gen_dir/${target_name}.cc"
outputs = [
output,
]
outputs = [ output ]
script = "../tools/create_archive.py"
args = [
@ -308,22 +280,16 @@ observatory_archive_source("embedded_archive_observatory") {
# TODO(zra): In a Fuchsia build, use a prebuilt Observatory archive.
archive_target = ":observatory_archive"
deps = [
archive_target,
]
deps = [ archive_target ]
archive_dir = get_label_info(archive_target, "target_gen_dir")
archive_name = get_label_info(archive_target, "name")
archive_file = "${archive_dir}/${archive_name}.tar"
}
source_set("embedded_observatory_archive") {
deps = [
":embedded_archive_observatory",
]
deps = [ ":embedded_archive_observatory" ]
sources = [
rebase_path("$target_gen_dir/embedded_archive_observatory.cc"),
]
sources = [ rebase_path("$target_gen_dir/embedded_archive_observatory.cc") ]
}
observatory_archive_source("standalone_archive_observatory") {
@ -332,20 +298,14 @@ observatory_archive_source("standalone_archive_observatory") {
# TODO(zra): In a Fuchsia build, use a prebuilt Observatory archive.
archive_target = ":compressed_observatory_archive"
deps = [
archive_target,
]
deps = [ archive_target ]
archive_dir = get_label_info(archive_target, "target_gen_dir")
archive_name = get_label_info(archive_target, "name")
archive_file = "${archive_dir}/${archive_name}.tar"
}
source_set("standalone_observatory_archive") {
deps = [
":standalone_archive_observatory",
]
deps = [ ":standalone_archive_observatory" ]
sources = [
rebase_path("$target_gen_dir/standalone_archive_observatory.cc"),
]
sources = [ rebase_path("$target_gen_dir/standalone_archive_observatory.cc") ]
}

View File

@ -100,14 +100,14 @@ compiler_sources = [
"compiler_state.h",
"ffi/abi.cc",
"ffi/abi.h",
"ffi/frame_rebase.cc",
"ffi/frame_rebase.h",
"ffi/marshaller.cc",
"ffi/marshaller.h",
"ffi/call.cc",
"ffi/call.h",
"ffi/callback.cc",
"ffi/callback.h",
"ffi/frame_rebase.cc",
"ffi/frame_rebase.h",
"ffi/marshaller.cc",
"ffi/marshaller.h",
"ffi/native_calling_convention.cc",
"ffi/native_calling_convention.h",
"ffi/native_location.cc",

View File

@ -28,8 +28,8 @@ vm_sources = [
"class_table.h",
"clustered_snapshot.cc",
"clustered_snapshot.h",
"code_comments.h",
"code_comments.cc",
"code_comments.h",
"code_descriptors.cc",
"code_descriptors.h",
"code_entry_kind.h",
@ -103,9 +103,9 @@ vm_sources = [
"exceptions.h",
"ffi_callback_trampolines.cc",
"ffi_callback_trampolines.h",
"finalizable_data.h",
"field_table.cc",
"field_table.h",
"finalizable_data.h",
"fixed_cache.h",
"flag_list.h",
"flags.cc",
@ -342,10 +342,10 @@ vm_sources = [
"token_position.h",
"type_table.h",
"type_testing_stubs.cc",
"type_testing_stubs.h",
"type_testing_stubs_arm.cc",
"type_testing_stubs_arm64.cc",
"type_testing_stubs_x64.cc",
"type_testing_stubs.h",
"unibrow-inl.h",
"unibrow.cc",
"unibrow.h",

View File

@ -9,5 +9,5 @@ ffi_sdk_sources = [
"annotations.dart",
"dynamic_library.dart",
"native_type.dart",
"struct.dart"
"struct.dart",
]

View File

@ -11,8 +11,8 @@ internal_sdk_sources = [
"cast.dart",
"errors.dart",
"iterable.dart",
"list.dart",
"linked_list.dart",
"list.dart",
"print.dart",
"sort.dart",
"symbol.dart",

View File

@ -17,8 +17,8 @@ io_sdk_sources = [
"file_impl.dart",
"file_system_entity.dart",
"io_resource_info.dart",
"io_sink.dart",
"io_service.dart",
"io_sink.dart",
"link.dart",
"namespace_impl.dart",
"network_profiling.dart",
@ -26,10 +26,10 @@ io_sdk_sources = [
"platform.dart",
"platform_impl.dart",
"process.dart",
"service_object.dart",
"secure_server_socket.dart",
"secure_socket.dart",
"security_context.dart",
"service_object.dart",
"socket.dart",
"stdio.dart",
"string_transformer.dart",

View File

@ -4,6 +4,7 @@
typed_data_sdk_sources = [
"typed_data.dart",
# The above file needs to be first if additional parts are added to the lib.
"unmodifiable_typed_data.dart",
]

View File

@ -11,9 +11,9 @@ vmservice_sdk_sources = [
"client.dart",
"constants.dart",
"devfs.dart",
"running_isolate.dart",
"running_isolates.dart",
"message.dart",
"message_router.dart",
"named_lookup.dart",
"running_isolate.dart",
"running_isolates.dart",
]

View File

@ -2,6 +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.
wasm_sdk_sources = [
"wasm.dart",
]
wasm_sdk_sources = [ "wasm.dart" ]

View File

@ -9,5 +9,5 @@ ffi_sdk_sources = [
"annotations.dart",
"dynamic_library.dart",
"native_type.dart",
"struct.dart"
"struct.dart",
]

View File

@ -11,8 +11,8 @@ internal_sdk_sources = [
"cast.dart",
"errors.dart",
"iterable.dart",
"list.dart",
"linked_list.dart",
"list.dart",
"print.dart",
"sort.dart",
"symbol.dart",

View File

@ -17,8 +17,8 @@ io_sdk_sources = [
"file_impl.dart",
"file_system_entity.dart",
"io_resource_info.dart",
"io_sink.dart",
"io_service.dart",
"io_sink.dart",
"link.dart",
"namespace_impl.dart",
"network_profiling.dart",
@ -26,10 +26,10 @@ io_sdk_sources = [
"platform.dart",
"platform_impl.dart",
"process.dart",
"service_object.dart",
"secure_server_socket.dart",
"secure_socket.dart",
"security_context.dart",
"service_object.dart",
"socket.dart",
"stdio.dart",
"string_transformer.dart",

View File

@ -4,6 +4,7 @@
typed_data_sdk_sources = [
"typed_data.dart",
# The above file needs to be first if additional parts are added to the lib.
"unmodifiable_typed_data.dart",
]

View File

@ -11,9 +11,9 @@ vmservice_sdk_sources = [
"client.dart",
"constants.dart",
"devfs.dart",
"running_isolate.dart",
"running_isolates.dart",
"message.dart",
"message_router.dart",
"named_lookup.dart",
"running_isolate.dart",
"running_isolates.dart",
]

View File

@ -2,6 +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.
wasm_sdk_sources = [
"wasm.dart",
]
wasm_sdk_sources = [ "wasm.dart" ]

View File

@ -23,27 +23,19 @@ llvm_library("LLVMDemangle") {
}
llvm_library("LLVMSupport") {
deps = [
":LLVMDemangle",
]
deps = [ ":LLVMDemangle" ]
}
llvm_library("LLVMAArch64Utils") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMBinaryFormat") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMDebugInfoMSF") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMDebugInfoCodeView") {
@ -70,9 +62,7 @@ llvm_library("LLVMAArch64AsmPrinter") {
}
llvm_library("LLVMAArch64Info") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMAArch64Desc") {
@ -308,9 +298,7 @@ llvm_library("LLVMAMDGPUAsmPrinter") {
}
llvm_library("LLVMAMDGPUInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMAMDGPUDesc") {
@ -441,9 +429,7 @@ llvm_library("LLVMARCAsmPrinter") {
}
llvm_library("LLVMARCInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMARCDesc") {
@ -481,9 +467,7 @@ llvm_library("LLVMARCDisassembler") {
}
llvm_library("LLVMARMUtils") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMARMAsmPrinter") {
@ -495,9 +479,7 @@ llvm_library("LLVMARMAsmPrinter") {
}
llvm_library("LLVMARMInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMARMDesc") {
@ -615,9 +597,7 @@ llvm_library("LLVMBPFAsmPrinter") {
}
llvm_library("LLVMBPFInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMBPFDesc") {
@ -701,9 +681,7 @@ llvm_library("LLVMDebugInfoPDB") {
}
llvm_library("LLVMOption") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMDlltoolDriver") {
@ -757,9 +735,7 @@ llvm_library("LLVMFuzzMutate") {
}
llvm_library("LLVMHexagonInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMHexagonDesc") {
@ -867,9 +843,7 @@ llvm_library("LLVMLTO") {
}
llvm_library("LLVMLanaiInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMLanaiAsmPrinter") {
@ -937,9 +911,7 @@ llvm_library("LLVMLibDriver") {
}
llvm_library("LLVMLineEditor") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMMIRParser") {
@ -962,9 +934,7 @@ llvm_library("LLVMMSP430AsmPrinter") {
}
llvm_library("LLVMMSP430Info") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMMSP430Desc") {
@ -999,9 +969,7 @@ llvm_library("LLVMMipsAsmPrinter") {
}
llvm_library("LLVMMipsInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMMipsDesc") {
@ -1056,9 +1024,7 @@ llvm_library("LLVMNVPTXAsmPrinter") {
}
llvm_library("LLVMNVPTXInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMNVPTXDesc") {
@ -1106,9 +1072,7 @@ llvm_library("LLVMX86AsmPrinter") {
}
llvm_library("LLVMX86Info") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMX86Desc") {
@ -1148,9 +1112,7 @@ llvm_library("LLVMNios2AsmPrinter") {
}
llvm_library("LLVMNios2Info") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMNios2Desc") {
@ -1205,9 +1167,7 @@ llvm_library("LLVMPowerPCAsmPrinter") {
}
llvm_library("LLVMPowerPCInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMPowerPCDesc") {
@ -1263,9 +1223,7 @@ llvm_library("LLVMRISCVAsmPrinter") {
}
llvm_library("LLVMRISCVInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMRISCVDesc") {
@ -1318,9 +1276,7 @@ llvm_library("LLVMSparcAsmPrinter") {
}
llvm_library("LLVMSparcInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMSparcDesc") {
@ -1383,9 +1339,7 @@ llvm_library("LLVMSystemZAsmPrinter") {
}
llvm_library("LLVMSystemZInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMSystemZDesc") {
@ -1435,21 +1389,15 @@ llvm_library("LLVMSystemZDisassembler") {
}
llvm_library("LLVMTableGen") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMTestingSupport") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMWebAssemblyInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMWebAssemblyAsmParser") {
@ -1504,9 +1452,7 @@ llvm_library("LLVMWebAssemblyDisassembler") {
}
llvm_library("LLVMWindowsManifest") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMX86AsmParser") {
@ -1536,9 +1482,7 @@ llvm_library("LLVMXCoreAsmPrinter") {
}
llvm_library("LLVMXCoreInfo") {
deps = [
":LLVMSupport",
]
deps = [ ":LLVMSupport" ]
}
llvm_library("LLVMXCoreDesc") {

View File

@ -93,9 +93,7 @@ template("_application_snapshot") {
dot_packages,
]
output = "$target_gen_dir/$name.dart.dill"
outputs = [
output,
]
outputs = [ output ]
depfile = "$output.d"
abs_depfile = rebase_path(depfile)
@ -133,9 +131,7 @@ template("_application_snapshot") {
inputs = extra_inputs
outputs = [
output,
]
outputs = [ output ]
abs_depfile = rebase_path(depfile)
abs_output = rebase_path(output, root_build_dir)

View File

@ -7,7 +7,5 @@ import("../application_snapshot.gni")
application_snapshot("kernel_worker") {
main_dart = "kernel_worker.dart"
training_args = [ "--help" ]
deps = [
"../../pkg:pkg_files_stamp",
]
deps = [ "../../pkg:pkg_files_stamp" ]
}

View File

@ -76,8 +76,7 @@ template("compile_platform") {
args +=
[ rebase_path(invoker.libraries_specification_uri, root_build_dir) ]
}
args +=
[ rebase_path("$root_out_dir/$outline", root_build_dir) ]
args += [ rebase_path("$root_out_dir/$outline", root_build_dir) ]
args += rebase_path(outputs, root_build_dir)
}
}

View File

@ -39,9 +39,7 @@ prebuilt_dart_action("dart2js_create_snapshot_entry") {
"../../tools/VERSION",
]
outputs = [
"$target_gen_dir/dart2js.dart",
]
outputs = [ "$target_gen_dir/dart2js.dart" ]
packages = "../../.packages"

View File

@ -18,9 +18,7 @@ template("create_timestamp_file") {
[ "absolute" ] + list_args,
"list lines")
inputs = [ "$_dart_root/tools/list_dart_files.py" ] + files
outputs = [
output,
]
outputs = [ output ]
script = "$_dart_root/tools/create_timestamp_file.py"
args = [ rebase_path(output) ]
}

View File

@ -5,15 +5,11 @@
import("../application_snapshot.gni")
group("dart2native") {
deps = [
":generate_dart2native_snapshot",
]
deps = [ ":generate_dart2native_snapshot" ]
}
application_snapshot("generate_dart2native_snapshot") {
main_dart = "../../pkg/dart2native/bin/dart2native.dart"
training_args = [
"--help",
]
training_args = [ "--help" ]
name = "dart2native"
}

View File

@ -43,9 +43,7 @@ prebuilt_dart_action("generate_summary_strong") {
packages = "../../.packages"
inputs = sdk_lib_files + analyzer_files
output = "$root_gen_dir/strong.sum"
outputs = [
output,
]
outputs = [ output ]
if (use_nnbd) {
args = [
"build-non-nullable",

View File

@ -54,9 +54,7 @@ application_snapshot("dartdevc") {
":dartdevc_platform",
]
inputs = [
sdk_outline_dill,
]
inputs = [ sdk_outline_dill ]
}
# TODO(#38701) Cleanup after merging the forked SDK into mainline.
@ -98,17 +96,13 @@ template("dart2js_compile") {
abs_output = rebase_path(out)
prebuilt_dart_action(target_name) {
deps = [
"../compiler:compile_dart2js_platform",
]
deps = [ "../compiler:compile_dart2js_platform" ]
inputs = sdk_lib_files + compiler_files + dev_compiler_files + [
"$root_out_dir/dart2js_platform.dill",
"$root_out_dir/dart2js_outline.dill",
]
outputs = [
out,
]
outputs = [ out ]
script = "../../pkg/compiler/lib/src/dart2js.dart"
@ -148,9 +142,7 @@ prebuilt_dart_action("dartdevc_patch_sdk") {
# Arbitrarily use the version file as a token file to check against to see if
# the sources have changed.
# TODO(rnystrom): List the outputs more precisely?
outputs = [
"$patched_sdk_dir/version",
]
outputs = [ "$patched_sdk_dir/version" ]
args = [
"--libraries",
@ -370,7 +362,10 @@ compile_platform("dartdevc_platform") {
# TODO(38701): Cleanup after merging the forked SDK into mainline.
if (use_nnbd) {
args += [ "--enable-experiment=non-nullable", "--force-nnbd-checks" ]
args += [
"--enable-experiment=non-nullable",
"--force-nnbd-checks",
]
}
}

View File

@ -6,17 +6,17 @@ import("../application_snapshot.gni")
application_snapshot("gen_kernel") {
main_dart = "../../pkg/vm/bin/gen_kernel.dart"
deps = [
"../../runtime/vm:vm_platform",
]
deps = [ "../../runtime/vm:vm_platform" ]
# NOTE: The output filename must be kept in sync with the output of the
# vm_platform rule.
vm_platform_out = get_label_info("../../runtime/vm:vm_platform", "root_out_dir")
vm_platform_out =
get_label_info("../../runtime/vm:vm_platform", "root_out_dir")
vm_platform = "$vm_platform_out/vm_platform_strong.dill"
training_args = [
"--platform",
rebase_path(vm_platform),
rebase_path("../../pkg/vm/bin/gen_kernel.dart"),
"-o -",
"--platform",
rebase_path(vm_platform),
rebase_path("../../pkg/vm/bin/gen_kernel.dart"),
"-o -",
]
}

View File

@ -10,13 +10,9 @@ import("../create_timestamp.gni")
group("kernel-service") {
if (create_kernel_service_snapshot) {
deps = [
":copy_kernel-service_snapshot",
]
deps = [ ":copy_kernel-service_snapshot" ]
} else {
deps = [
":kernel_service_dill",
]
deps = [ ":kernel_service_dill" ]
}
}
@ -37,15 +33,9 @@ kernel_application_snapshot("kernel-service_snapshot") {
}
copy("copy_kernel-service_snapshot") {
deps = [
":kernel-service_snapshot",
]
sources = [
"$root_gen_dir/kernel-service.dart.snapshot",
]
outputs = [
"$root_out_dir/kernel-service.dart.snapshot",
]
deps = [ ":kernel-service_snapshot" ]
sources = [ "$root_gen_dir/kernel-service.dart.snapshot" ]
outputs = [ "$root_out_dir/kernel-service.dart.snapshot" ]
}
create_timestamp_file("frontend_server_files_stamp") {
@ -90,9 +80,7 @@ template("kernel_service_dill") {
"$root_out_dir/vm_platform_strong.dill",
]
output = "$root_gen_dir/kernel_service" + invoker.target_name + ".dill"
outputs = [
output,
]
outputs = [ output ]
depfile = "$root_gen_dir/kernel_service" + invoker.target_name + "_dill.d"
abs_depfile = rebase_path(depfile)