Index: runtime/vm/BUILD.gn |
diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn |
index 5f0a1ba8480c9ac89ce867e9cde9d4ff3f734004..225afdf8892cd16e8be35964273ddc982cfaff17 100644 |
--- a/runtime/vm/BUILD.gn |
+++ b/runtime/vm/BUILD.gn |
@@ -25,7 +25,8 @@ config("libdart_vm_config") { |
static_library("libdart_platform") { |
- configs += ["..:dart_config", "..:dart_product_config"] |
+ configs += ["..:dart_config", |
+ "..:dart_maybe_product_config"] |
public_configs = [":libdart_vm_config"] |
platform_headers_gypi = |
@@ -59,7 +60,20 @@ vm_sources_list = exec_script("../../tools/gypi_to_gn.py", |
static_library("libdart_vm") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
+ "..:dart_maybe_product_config", |
+ "..:dart_maybe_precompiled_runtime_config"] |
+ public_configs = [":libdart_vm_config"] |
+ set_sources_assignment_filter(["*_test.cc", "*_test.h"]) |
+ sources = vm_sources_list.sources |
+ include_dirs = [ |
+ "..", |
+ ] |
+} |
+ |
+ |
+static_library("libdart_vm_precompiled_runtime") { |
+ configs += ["..:dart_config", |
+ "..:dart_maybe_product_config", |
"..:dart_precompiled_runtime_config"] |
public_configs = [":libdart_vm_config"] |
set_sources_assignment_filter(["*_test.cc", "*_test.h"]) |
@@ -72,10 +86,24 @@ static_library("libdart_vm") { |
static_library("libdart_vm_nosnapshot") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
- "..:dart_precompiled_runtime_config"] |
+ "..:dart_maybe_product_config", |
+ "..:dart_maybe_precompiled_runtime_config", |
+ "..:dart_no_snapshot_config",] |
+ public_configs = [":libdart_vm_config"] |
+ set_sources_assignment_filter(["*_test.cc", "*_test.h"]) |
+ sources = vm_sources_list.sources |
+ include_dirs = [ |
+ "..", |
+ ] |
+} |
+ |
+ |
+static_library("libdart_vm_nosnapshot_precompiled_runtime") { |
+ configs += ["..:dart_config", |
+ "..:dart_maybe_product_config", |
+ "..:dart_precompiled_runtime_config", |
+ "..:dart_no_snapshot_config",] |
public_configs = [":libdart_vm_config"] |
- defines = [ "DART_NO_SNAPSHOT" ] |
set_sources_assignment_filter(["*_test.cc", "*_test.h"]) |
sources = vm_sources_list.sources |
include_dirs = [ |
@@ -86,10 +114,10 @@ static_library("libdart_vm_nosnapshot") { |
static_library("libdart_vm_nosnapshot_with_precompiler") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
- "..:dart_precompiler_config"] |
+ "..:dart_maybe_product_config", |
+ "..:dart_precompiler_config", |
+ "..:dart_no_snapshot_config",] |
public_configs = [":libdart_vm_config"] |
- defines = [ "DART_NO_SNAPSHOT" ] |
set_sources_assignment_filter(["*_test.cc", "*_test.h"]) |
sources = vm_sources_list.sources |
include_dirs = [ |
@@ -190,7 +218,17 @@ template("generate_core_libraries") { |
static_library("libdart_lib_nosnapshot") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
+ "..:dart_maybe_product_config", |
+ "..:dart_maybe_precompiled_runtime_config"] |
+ deps = libdeps |
+ sources = libsources + ["bootstrap.cc"] + liboutputs |
+ include_dirs = [ |
+ "..", |
+ ] |
+ } |
+ static_library("libdart_lib_nosnapshot_precompiled_runtime") { |
+ configs += ["..:dart_config", |
+ "..:dart_maybe_product_config", |
"..:dart_precompiled_runtime_config"] |
deps = libdeps |
sources = libsources + ["bootstrap.cc"] + liboutputs |
@@ -200,7 +238,7 @@ template("generate_core_libraries") { |
} |
static_library("libdart_lib_nosnapshot_with_precompiler") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
+ "..:dart_maybe_product_config", |
"..:dart_precompiler_config" ] |
deps = libdeps |
sources = libsources + [ "bootstrap.cc"] + liboutputs |
@@ -210,7 +248,16 @@ template("generate_core_libraries") { |
} |
static_library("libdart_lib") { |
configs += ["..:dart_config", |
- "..:dart_product_config", |
+ "..:dart_maybe_product_config", |
+ "..:dart_maybe_precompiled_runtime_config"] |
+ sources = libsources + [ "bootstrap_nocore.cc"] |
+ include_dirs = [ |
+ "..", |
+ ] |
+ } |
+ static_library("libdart_lib_precompiled_runtime") { |
+ configs += ["..:dart_config", |
+ "..:dart_maybe_product_config", |
"..:dart_precompiled_runtime_config"] |
sources = libsources + [ "bootstrap_nocore.cc"] |
include_dirs = [ |