diff --git a/.gn b/.gn index fca256e85be..cdab7127e09 100644 --- a/.gn +++ b/.gn @@ -19,4 +19,7 @@ script_executable = "python3" default_args = { # Overwrite default args declared in the Fuchsia sdk fuchsia_sdk_readelf_exec = "//buildtools/linux-x64/clang/bin/llvm-readelf" + + # Dart uses of a copy of icudata embedded into the executable + icu_copy_icudata_to_root_build_dir = false } diff --git a/BUILD.gn b/BUILD.gn index f9db4cdc3be..2e112888cb2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -417,11 +417,11 @@ if (is_fuchsia) { dart_snapshot_kind = "kernel" main_dart = test_source training_args = [] # Not used - output = "$target_gen_dir/$test_source.dill" + output = "$target_out_dir/$test_source.dill" } aot_snapshot(aot_label) { main_dart = test_source - output = "$target_gen_dir/$test_source.elf" + output = "$target_out_dir/$test_source.elf" } test_deps += [ @@ -430,11 +430,11 @@ if (is_fuchsia) { ] test_resources += [ { - path = rebase_path("$target_gen_dir/$test_source.dill") + path = "$target_out_dir/$test_source.dill" dest = "data/$test_source" }, { - path = rebase_path("$target_gen_dir/$test_source.elf") + path = "$target_out_dir/$test_source.elf" dest = "data/$test_source.elf" }, ] @@ -472,7 +472,7 @@ if (is_fuchsia) { resources += [ { path = get_label_info("runtime/bin:ffi_callback_stub_bin", - "target_gen_dir") + "/ffi_callback_stub.bin" + "target_out_dir") + "/ffi_callback_stub.bin" dest = "lib/ffi_callback_stub.bin" }, ] diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py index 2455ce93c0b..18b37ee84b8 100644 --- a/build/rbe/rewrapper_dart.py +++ b/build/rbe/rewrapper_dart.py @@ -301,19 +301,19 @@ trace to find the place to insert the appropriate support. elif arg == '../../pkg/compiler/lib/src/dart2js.dart': self.entry_points.add(self.rebase(arg)) return self.parse_dart2js() - elif arg == 'gen/utils/compiler/dart2js.dart.dill': + elif arg == 'obj/utils/compiler/dart2js.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_dart2js() elif arg == '../../pkg/dev_compiler/bin/dartdevc.dart': self.entry_points.add(self.rebase(arg)) return self.parse_dartdevc() - elif arg == 'gen/utils/ddc/dartdevc.dart.dill': + elif arg == 'obj/utils/ddc/dartdevc.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_dartdevc() - elif arg == 'gen/utils/dartanalyzer/dartanalyzer.dart.dill': + elif arg == 'obj/utils/dartanalyzer/dartanalyzer.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_dartanalyzer() - elif arg == 'gen/utils/analysis_server/analysis_server.dart.dill': + elif arg == 'obj/utils/analysis_server/analysis_server.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_analysis_server() elif arg == '../../pkg/front_end/tool/compile_platform.dart': @@ -331,28 +331,28 @@ trace to find the place to insert the appropriate support. elif arg == '../../pkg/vm/bin/gen_kernel.dart': self.entry_points.add(self.rebase(arg)) return self.parse_gen_kernel() - elif arg == 'gen/utils/kernel-service/frontend_server.dart.dill': + elif arg == 'obj/utils/kernel-service/frontend_server.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_frontend_server() - elif arg == 'gen/utils/dtd/generate_dtd_snapshot.dart.dill': + elif arg == 'obj/utils/dtd/generate_dtd_snapshot.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_generate_dtd_snapshot() - elif arg == 'gen/utils/dds/generate_dds_snapshot.dart.dill': + elif arg == 'obj/utils/dds/generate_dds_snapshot.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_generate_dds_snapshot() - elif arg == 'gen/utils/bazel/kernel_worker.dart.dill': + elif arg == 'obj/utils/bazel/kernel_worker.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_kernel_worker() - elif arg == 'gen/utils/dart_runtime_service_vm/generate_dart_runtime_service_vm_snapshot.dart.dill': + elif arg == 'obj/utils/dart_runtime_service_vm/generate_dart_runtime_service_vm_snapshot.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_generate_dart_runtime_service_vm_snapshot() - elif arg == 'gen/utils/dartdev/generate_dartdev_snapshot.dart.dill': + elif arg == 'obj/utils/dartdev/generate_dartdev_snapshot.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_generate_dartdev_snapshot() elif arg == 'gen/utils/gen_kernel/bootstrap_gen_kernel.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_bootstrap_gen_kernel() - elif arg == 'gen/utils/kernel-service/kernel-service_snapshot.dart.dill': + elif arg == 'obj/utils/kernel-service/kernel-service_snapshot.dart.dill': self.extra_paths.add(self.rebase(arg)) self.extra_paths.add( self.rebase( diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index c26b1fe51b4..1a048294434 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -616,8 +616,8 @@ dart_io("common_embedder_dart_io_product") { gen_snapshot_action("core_snapshot_bin") { deps = [ "../vm:vm_platform_stripped" ] - snapshot_data = "$target_gen_dir/core_snapshot_data.bin" - snapshot_text = "$target_gen_dir/core_snapshot_text.bin" + snapshot_data = "$target_out_dir/core_snapshot_data.bin" + snapshot_text = "$target_out_dir/core_snapshot_text.bin" platform_dill = "$root_out_dir/vm_platform_stripped.dill" inputs = [ platform_dill ] @@ -638,12 +638,12 @@ gen_snapshot_action("ffi_callback_stub_bin") { deps = [ "../vm:vm_platform_stripped" ] platform_dill = "$root_out_dir/vm_platform_stripped.dill" inputs = [ platform_dill ] - outputs = [ "$target_gen_dir/ffi_callback_stub.bin" ] + outputs = [ "$target_out_dir/ffi_callback_stub.bin" ] args = [ "--deterministic", "--snapshot_kind=ffi-callback-stub", "--ffi_callback_stub=" + - rebase_path("$target_gen_dir/ffi_callback_stub.bin", root_build_dir), + rebase_path("$target_out_dir/ffi_callback_stub.bin", root_build_dir), rebase_path(platform_dill, root_build_dir), ] } @@ -744,14 +744,14 @@ template("bin_to_linkable") { bin_to_linkable("core_snapshot_data_linkable") { deps = [ ":core_snapshot_bin" ] - input = "$target_gen_dir/core_snapshot_data.bin" + input = "$target_out_dir/core_snapshot_data.bin" symbol = "kDartCoreSnapshotData" executable = false } bin_to_linkable("core_snapshot_text_linkable") { deps = [ ":core_snapshot_bin" ] - input = "$target_gen_dir/core_snapshot_text.bin" + input = "$target_out_dir/core_snapshot_text.bin" symbol = "kDartCoreSnapshotText" executable = true } diff --git a/utils/aot_snapshot.gni b/utils/aot_snapshot.gni index 647f320319a..da742f0be50 100644 --- a/utils/aot_snapshot.gni +++ b/utils/aot_snapshot.gni @@ -44,8 +44,8 @@ template("aot_snapshot") { output = invoker.output } - dill = "$target_gen_dir/$name.dart.dill" - unsigned_snapshot = "$target_gen_dir/$name.dart.snapshot.unsigned" + dill = "$target_out_dir/$name.dart.dill" + unsigned_snapshot = "$target_out_dir/$name.dart.snapshot.unsigned" signed_snapshot = output # Build the kernel file using the prebuilt VM to speed up the debug and diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index b8a81fe60d9..bdad9c8290a 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -140,7 +140,7 @@ template("application_snapshot") { main_dart, package_config, ] - output = "$target_gen_dir/$name.dart.dill" + output = "$target_out_dir/$name.dart.dill" outputs = [ output ] depfile = "$output.d" @@ -182,7 +182,7 @@ template("application_snapshot") { if (dart_snapshot_kind == "kernel") { copy(target_name) { deps = extra_deps + [ ":${target_name}_dill" ] - sources = [ "$target_gen_dir/$name.dart.dill" ] + sources = [ "$target_out_dir/$name.dart.dill" ] outputs = [ output ] assert(snapshot_vm_args != "", "Ignoring unused argument") @@ -199,7 +199,7 @@ template("application_snapshot") { deps = extra_deps + [ ":${target_name}_dill" ] + training_deps depfile = "$output.d" - script = "$target_gen_dir/$name.dart.dill" + script = "$target_out_dir/$name.dart.dill" inputs = extra_inputs + training_inputs