Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: runtime/bin/BUILD.gn

Issue 1903583002: GN Build fixes for Flutter + gen_snapshot fix (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/bin/BUILD.gn
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 20b2a8a84a0a9d4e058c9a82e5da82fa00fbb6d4..79d025bcad3369fe357240a0f1c9bd277d90d98a 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -119,7 +119,7 @@ builtin_impl_sources_gypi =
["builtin_impl_sources.gypi"])
static_library("libdart_builtin") {
- configs += ["..:dart_config"]
+ configs += ["..:dart_config", "..:dart_product_config"]
public_configs = [":libdart_builtin_config"]
deps = [
":generate_builtin_cc_file",
@@ -140,7 +140,7 @@ static_library("libdart_builtin") {
static_library("libdart_nosnapshot") {
- configs += ["..:dart_config"]
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
deps = [
"../vm:libdart_lib_nosnapshot",
"../vm:libdart_vm_nosnapshot",
@@ -171,8 +171,40 @@ static_library("libdart_nosnapshot") {
}
+static_library("libdart_nosnapshot_with_precompiler") {
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiler_config"]
+ deps = [
+ "../vm:libdart_lib_nosnapshot_with_precompiler",
+ "../vm:libdart_vm_nosnapshot_with_precompiler",
+ "../vm:libdart_platform",
+ "../third_party/double-conversion/src:libdouble_conversion",
+ "..:generate_version_cc_file",
+ ]
+
+ sources = [
+ "../include/dart_api.h",
+ "../include/dart_mirrors_api.h",
+ "../include/dart_native_api.h",
+ "../include/dart_tools_api.h",
+ "../vm/dart_api_impl.cc",
+ "../vm/debugger_api_impl.cc",
+ "../vm/mirrors_api_impl.cc",
+ "../vm/native_api_impl.cc",
+ "$target_gen_dir/../version.cc",
+ ]
+
+ include_dirs = [
+ "..",
+ ]
+
+ defines = [
+ "DART_SHARED_LIB",
+ ]
+}
+
+
executable("gen_snapshot") {
- configs += ["..:dart_config"]
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiler_config"]
deps = [
":gen_resources_cc",
":gen_snapshot_dart_io",
@@ -180,7 +212,7 @@ executable("gen_snapshot") {
":generate_io_cc_file",
":generate_io_patch_cc_file",
":libdart_builtin",
- ":libdart_nosnapshot",
+ ":libdart_nosnapshot_with_precompiler",
]
sources = [
@@ -207,7 +239,7 @@ executable("gen_snapshot") {
source_set("libdart_embedder_noio") {
- configs += ["..:dart_config",]
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
deps = [
"..:libdart",
"../vm:libdart_platform",
@@ -224,7 +256,7 @@ io_impl_sources_gypi =
# A source set for the implementation of 'dart:io' library
# (without secure sockets) suitable for linking with gen_snapshot.
source_set("gen_snapshot_dart_io") {
- configs += ["..:dart_config",]
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiler_config"]
deps = [
"//third_party/zlib",
@@ -263,7 +295,7 @@ source_set("gen_snapshot_dart_io") {
# A source set for the implementation of 'dart:io' library
# (without secure sockets).
source_set("embedded_dart_io") {
- configs += ["..:dart_config",]
+ configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
custom_sources_filter = [
"*_test.cc",

Powered by Google App Engine
This is Rietveld 408576698