mirror of
https://github.com/dart-lang/sdk
synced 2024-10-14 17:56:11 +00:00
Mostly revert "[fuchsia] Prepare for setting the Dart target architecture appropriately in the host binaries."
This reverts commit 9ab39ae099
.
Keep removal of bad assert in loader.dart. Keep using script snapshot in cross builds.
We expect to use a checked-in SDK in the Fuschia build instead.
R=zra@google.com
Review-Url: https://codereview.chromium.org/2951133002 .
This commit is contained in:
parent
945540c8bb
commit
1eee6d8af3
|
@ -72,11 +72,27 @@ config("dart_no_snapshot_config") {
|
|||
defines += [ "DART_NO_SNAPSHOT" ]
|
||||
}
|
||||
|
||||
# TODO(rmacnak): If Fuchsia adds a checked-in SDK, this should be folded back
|
||||
# into dart_config
|
||||
config("dart_use_target_arch_config") {
|
||||
config("dart_config") {
|
||||
defines = []
|
||||
|
||||
if (target_os == "android") {
|
||||
defines += [ "TARGET_OS_ANDROID" ]
|
||||
} else if (target_os == "fuchsia") {
|
||||
defines += [ "TARGET_OS_FUCHSIA" ]
|
||||
} else if (target_os == "ios") {
|
||||
defines += [ "TARGET_OS_MACOS" ]
|
||||
defines += [ "TARGET_OS_MACOS_IOS" ]
|
||||
} else if (target_os == "linux") {
|
||||
defines += [ "TARGET_OS_LINUX" ]
|
||||
} else if (target_os == "mac") {
|
||||
defines += [ "TARGET_OS_MACOS" ]
|
||||
} else if (target_os == "win") {
|
||||
defines += [ "TARGET_OS_WINDOWS" ]
|
||||
} else {
|
||||
print("Unknown target_os: $target_os")
|
||||
assert(false)
|
||||
}
|
||||
|
||||
if (dart_target_arch != "") {
|
||||
if (dart_target_arch == "arm" || dart_target_arch == "simarm") {
|
||||
defines += [ "TARGET_ARCH_ARM" ]
|
||||
|
@ -106,28 +122,6 @@ config("dart_use_target_arch_config") {
|
|||
assert(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
config("dart_config") {
|
||||
defines = []
|
||||
|
||||
if (target_os == "android") {
|
||||
defines += [ "TARGET_OS_ANDROID" ]
|
||||
} else if (target_os == "fuchsia") {
|
||||
defines += [ "TARGET_OS_FUCHSIA" ]
|
||||
} else if (target_os == "ios") {
|
||||
defines += [ "TARGET_OS_MACOS" ]
|
||||
defines += [ "TARGET_OS_MACOS_IOS" ]
|
||||
} else if (target_os == "linux") {
|
||||
defines += [ "TARGET_OS_LINUX" ]
|
||||
} else if (target_os == "mac") {
|
||||
defines += [ "TARGET_OS_MACOS" ]
|
||||
} else if (target_os == "win") {
|
||||
defines += [ "TARGET_OS_WINDOWS" ]
|
||||
} else {
|
||||
print("Unknown target_os: $target_os")
|
||||
assert(false)
|
||||
}
|
||||
|
||||
if (dart_debug) {
|
||||
defines += [ "DEBUG" ]
|
||||
|
@ -232,7 +226,6 @@ template("libdart_library") {
|
|||
}
|
||||
|
||||
libdart_library("libdart_jit") {
|
||||
extra_configs = [ ":dart_use_target_arch_config" ]
|
||||
extra_deps = [
|
||||
"vm:libdart_lib_jit",
|
||||
"vm:libdart_vm_jit",
|
||||
|
@ -240,10 +233,7 @@ libdart_library("libdart_jit") {
|
|||
}
|
||||
|
||||
libdart_library("libdart_precompiled_runtime") {
|
||||
extra_configs = [
|
||||
":dart_precompiled_runtime_config",
|
||||
":dart_use_target_arch_config",
|
||||
]
|
||||
extra_configs = [ ":dart_precompiled_runtime_config" ]
|
||||
extra_deps = [
|
||||
"vm:libdart_lib_precompiled_runtime",
|
||||
"vm:libdart_vm_precompiled_runtime",
|
||||
|
@ -254,7 +244,6 @@ libdart_library("libdart_nosnapshot_with_precompiler") {
|
|||
extra_configs = [
|
||||
":dart_no_snapshot_config",
|
||||
":dart_precompiler_config",
|
||||
":dart_use_target_arch_config",
|
||||
]
|
||||
extra_deps = [
|
||||
"vm:libdart_lib_nosnapshot_with_precompiler",
|
||||
|
@ -262,23 +251,8 @@ libdart_library("libdart_nosnapshot_with_precompiler") {
|
|||
]
|
||||
}
|
||||
|
||||
# TODO(rmacnak): Remove if Fuchsia adds a checked-in SDK.
|
||||
libdart_library("libdart_nosnapshot_with_precompiler_host_arch") {
|
||||
extra_configs = [
|
||||
":dart_no_snapshot_config",
|
||||
":dart_precompiler_config",
|
||||
]
|
||||
extra_deps = [
|
||||
"vm:libdart_lib_nosnapshot_with_precompiler_host_arch",
|
||||
"vm:libdart_vm_nosnapshot_with_precompiler_host_arch",
|
||||
]
|
||||
}
|
||||
|
||||
libdart_library("libdart_with_precompiler") {
|
||||
extra_configs = [
|
||||
":dart_precompiler_config",
|
||||
":dart_use_target_arch_config",
|
||||
]
|
||||
extra_configs = [ ":dart_precompiler_config" ]
|
||||
extra_deps = [
|
||||
"vm:libdart_lib_with_precompiler",
|
||||
"vm:libdart_vm_with_precompiler",
|
||||
|
|
|
@ -277,7 +277,6 @@ executable("gen_snapshot") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -683,7 +682,6 @@ template("dart_executable") {
|
|||
}
|
||||
|
||||
dart_executable("dart") {
|
||||
extra_configs = [ "..:dart_use_target_arch_config" ]
|
||||
extra_deps = [
|
||||
"..:libdart_jit",
|
||||
":dart_snapshot_cc",
|
||||
|
@ -712,16 +710,11 @@ dart_executable("dart_precompiled_runtime") {
|
|||
]
|
||||
}
|
||||
|
||||
template("dart_bootstrap_template") {
|
||||
invoker_extra_configs = []
|
||||
if (defined(invoker.extra_configs)) {
|
||||
invoker_extra_configs += invoker.extra_configs
|
||||
}
|
||||
dart_executable(target_name) {
|
||||
dart_executable("dart_bootstrap") {
|
||||
extra_configs = [
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_no_snapshot_config",
|
||||
] + invoker_extra_configs
|
||||
]
|
||||
extra_deps = [
|
||||
":generate_builtin_cc_file",
|
||||
":generate_io_cc_file",
|
||||
|
@ -769,16 +762,6 @@ template("dart_bootstrap_template") {
|
|||
"$target_gen_dir/web_audio_gen.cc",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
dart_bootstrap_template("dart_bootstrap") {
|
||||
extra_configs = [ "..:dart_use_target_arch_config" ]
|
||||
}
|
||||
|
||||
# TODO(rmacnak): Remove if Fuchsia adds a checked-in SDK.
|
||||
dart_bootstrap_template("dart_bootstrap_host_arch") {
|
||||
extra_configs = []
|
||||
}
|
||||
|
||||
if (is_fuchsia) {
|
||||
hello_fuchsia_source = rebase_path("../tests/vm/dart/hello_fuchsia_test.dart")
|
||||
|
@ -866,7 +849,6 @@ executable("run_vm_tests") {
|
|||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
|
|
@ -40,13 +40,11 @@ if (dart_host_pub_exe != "") {
|
|||
dart_host_pub_exe,
|
||||
]
|
||||
} else if (!prebuilt_dart_exe_works) {
|
||||
pub_build_deps += [ "../bin:dart_bootstrap_host_arch($host_toolchain)" ]
|
||||
pub_build_deps += [ "../bin:dart_bootstrap($host_toolchain)" ]
|
||||
|
||||
dart_out_dir =
|
||||
get_label_info("../bin:dart_bootstrap_host_arch($host_toolchain)",
|
||||
"root_out_dir")
|
||||
dart_bootstrap =
|
||||
rebase_path("$dart_out_dir/dart_bootstrap_host_arch$executable_suffix")
|
||||
get_label_info("../bin:dart_bootstrap($host_toolchain)", "root_out_dir")
|
||||
dart_bootstrap = rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
|
||||
|
||||
pub_build_args = [
|
||||
"--sdk=True",
|
||||
|
|
|
@ -49,7 +49,6 @@ static_library("libdart_vm_jit") {
|
|||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -68,7 +67,6 @@ static_library("libdart_vm_precompiled_runtime") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiled_runtime_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -87,7 +85,6 @@ static_library("libdart_vm_nosnapshot") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_no_snapshot_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -102,26 +99,6 @@ static_library("libdart_vm_nosnapshot") {
|
|||
}
|
||||
|
||||
static_library("libdart_vm_nosnapshot_with_precompiler") {
|
||||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_no_snapshot_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
}
|
||||
public_configs = [ ":libdart_vm_config" ]
|
||||
set_sources_assignment_filter([
|
||||
"*_test.cc",
|
||||
"*_test.h",
|
||||
])
|
||||
sources = vm_sources_list
|
||||
include_dirs = [ ".." ]
|
||||
}
|
||||
|
||||
static_library("libdart_vm_nosnapshot_with_precompiler_host_arch") {
|
||||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
|
@ -145,7 +122,6 @@ static_library("libdart_vm_with_precompiler") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -255,21 +231,6 @@ template("generate_core_libraries") {
|
|||
all_libsources = rebase_path(invoker.allsources, ".", "../lib")
|
||||
|
||||
static_library("libdart_lib_nosnapshot_with_precompiler") {
|
||||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
}
|
||||
deps = libdeps
|
||||
sources = all_libsources + [ "bootstrap.cc" ] + liboutputs
|
||||
include_dirs = [ ".." ]
|
||||
}
|
||||
|
||||
static_library("libdart_lib_nosnapshot_with_precompiler_host_arch") {
|
||||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
|
@ -288,7 +249,6 @@ template("generate_core_libraries") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiler_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -302,7 +262,6 @@ template("generate_core_libraries") {
|
|||
configs += [
|
||||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
@ -316,7 +275,6 @@ template("generate_core_libraries") {
|
|||
"..:dart_config",
|
||||
"..:dart_maybe_product_config",
|
||||
"..:dart_precompiled_runtime_config",
|
||||
"..:dart_use_target_arch_config",
|
||||
]
|
||||
if (is_fuchsia) {
|
||||
configs -= [ "//build/config:symbol_visibility_hidden" ]
|
||||
|
|
|
@ -48,9 +48,7 @@ template("generate_summary") {
|
|||
type = invoker.type
|
||||
assert(type == "spec" || type == "strong")
|
||||
compiled_action(target_name) {
|
||||
# TODO(rmacnak): If Fuchsia adds a checked-in SDK, revert this to use
|
||||
# the 'dart' binary.
|
||||
tool = "../../runtime/bin:dart_bootstrap_host_arch"
|
||||
tool = "../../runtime/bin:dart"
|
||||
inputs = sdk_lib_files + analyzer_files
|
||||
|
||||
output = "$root_gen_dir/$type.sum"
|
||||
|
|
|
@ -28,7 +28,7 @@ template("generate_patched_sdk") {
|
|||
}
|
||||
|
||||
if (!prebuilt_dart_exe_works) {
|
||||
deps += [ "$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)" ]
|
||||
deps += [ "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)" ]
|
||||
}
|
||||
|
||||
script = "$_dart_root/tools/patch_sdk.py"
|
||||
|
@ -49,10 +49,10 @@ template("generate_patched_sdk") {
|
|||
args = [ "--quiet" ]
|
||||
if (!prebuilt_dart_exe_works) {
|
||||
dart_out_dir = get_label_info(
|
||||
"$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)",
|
||||
"$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)",
|
||||
"root_out_dir")
|
||||
dart_bootstrap = rebase_path(
|
||||
"$dart_out_dir/dart_bootstrap_host_arch$executable_suffix")
|
||||
dart_bootstrap =
|
||||
rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
|
||||
args += [
|
||||
"--dart-executable",
|
||||
dart_bootstrap,
|
||||
|
|
Loading…
Reference in a new issue