| Index: runtime/bin/BUILD.gn
|
| diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
|
| index 495d1176725dab7fb4d5743b4a93f7ca69c250c7..78159eeb825069991271c6a56f64c609b449b7d9 100644
|
| --- a/runtime/bin/BUILD.gn
|
| +++ b/runtime/bin/BUILD.gn
|
| @@ -773,7 +773,7 @@ action("generate_snapshot_test_dat_file") {
|
| }
|
|
|
| executable("run_vm_tests") {
|
| - if (defined(is_fuchsia) && is_fuchsia) {
|
| + if (defined(is_fuchsia) && (is_fuchsia || is_fuchsia_host)) {
|
| testonly = true
|
| }
|
|
|
| @@ -824,44 +824,42 @@ executable("run_vm_tests") {
|
| }
|
| }
|
|
|
| -if (!defined(is_fuchsia) || !is_fuchsia) {
|
| - shared_library("test_extension") {
|
| - deps = [
|
| - ":dart",
|
| - ]
|
| - sources = [
|
| - "test_extension.c",
|
| - "test_extension_dllmain_win.cc",
|
| - ]
|
| - 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" ]
|
| - abs_root_out_dir = rebase_path(root_out_dir)
|
| - ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| - }
|
| +shared_library("test_extension") {
|
| + deps = [
|
| + ":dart",
|
| + ]
|
| + sources = [
|
| + "test_extension.c",
|
| + "test_extension_dllmain_win.cc",
|
| + ]
|
| + 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" ]
|
| + abs_root_out_dir = rebase_path(root_out_dir)
|
| + ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| }
|
| +}
|
|
|
| - shared_library("sample_extension") {
|
| - deps = [
|
| - ":dart",
|
| - ]
|
| - sources = [
|
| - "../../samples/sample_extension/sample_extension.cc",
|
| - "../../samples/sample_extension/sample_extension_dllmain_win.cc",
|
| - ]
|
| - 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" ]
|
| - abs_root_out_dir = rebase_path(root_out_dir)
|
| - ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| - }
|
| +shared_library("sample_extension") {
|
| + deps = [
|
| + ":dart",
|
| + ]
|
| + sources = [
|
| + "../../samples/sample_extension/sample_extension.cc",
|
| + "../../samples/sample_extension/sample_extension_dllmain_win.cc",
|
| + ]
|
| + 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" ]
|
| + abs_root_out_dir = rebase_path(root_out_dir)
|
| + ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
|
| }
|
| }
|
|
|