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

Unified Diff: runtime/bin/BUILD.gn

Issue 2964133002: Exclude Observatory assets from PRODUCT build dart, dart_precompiled_runtime (Closed)
Patch Set: Addressed comments Created 3 years, 6 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
« no previous file with comments | « runtime/BUILD.gn ('k') | runtime/bin/vmservice_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/BUILD.gn
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 773777798426c39a164e88f0683566c68f56eff9..8de7a1b0a8c302a9ddad2128b315cade52c1130c 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -619,7 +619,7 @@ template("dart_executable") {
if (is_fuchsia) {
configs -= [ "//build/config:symbol_visibility_hidden" ]
}
- if (defined(is_fuchsia_host) && is_fuchsia_host) {
+ if (is_fuchsia_host) {
# We already have these in the standalone build, but Fuchsia doesn't
# have them. They are needed for running Fuchsia binaries built for the
# host.
@@ -631,7 +631,6 @@ template("dart_executable") {
}
deps = [
- ":gen_resources_cc",
":standalone_dart_io",
":libdart_builtin",
"$dart_zlib_path",
@@ -651,7 +650,6 @@ template("dart_executable") {
"snapshot_utils.h",
"vmservice_impl.cc",
"vmservice_impl.h",
- "$target_gen_dir/resources_gen.cc",
] + extra_sources
include_dirs = [
@@ -662,7 +660,9 @@ template("dart_executable") {
if (is_win) {
ldflags = [ "/EXPORT:Dart_True" ]
} else {
- ldflags = [ "-rdynamic" ]
+ if (dart_runtime_mode != "release") {
+ ldflags = [ "-rdynamic" ]
+ }
}
if (is_win) {
@@ -685,29 +685,39 @@ dart_executable("dart") {
extra_deps = [
"..:libdart_jit",
":dart_snapshot_cc",
- "../observatory:standalone_observatory_archive",
+ ":gen_resources_cc",
]
+ if (dart_runtime_mode != "release") {
+ extra_deps += [ "../observatory:standalone_observatory_archive" ]
+ }
extra_sources = [
"builtin_nolib.cc",
"dfe.cc",
"dfe.h",
"loader.cc",
"loader.h",
+ "$target_gen_dir/resources_gen.cc",
]
+ if (dart_runtime_mode == "release") {
+ extra_sources += [ "observatory_assets_empty.cc" ]
+ }
}
dart_executable("dart_precompiled_runtime") {
extra_configs = [ "..:dart_precompiled_runtime_config" ]
- extra_deps = [
- "..:libdart_precompiled_runtime",
- "../observatory:standalone_observatory_archive",
- ]
+ extra_deps = [ "..:libdart_precompiled_runtime" ]
+ if (dart_runtime_mode != "release") {
+ extra_deps += [ "../observatory:standalone_observatory_archive" ]
+ }
extra_sources = [
"builtin_nolib.cc",
"snapshot_empty.cc",
"loader.cc",
"loader.h",
]
+ if (dart_runtime_mode == "release") {
+ extra_sources += [ "observatory_assets_empty.cc" ]
+ }
}
dart_executable("dart_bootstrap") {
@@ -716,21 +726,22 @@ dart_executable("dart_bootstrap") {
"..:dart_no_snapshot_config",
]
extra_deps = [
+ ":gen_resources_cc",
+ ":generate_blink_cc_file",
":generate_builtin_cc_file",
- ":generate_io_cc_file",
- ":generate_io_patch_cc_file",
+ ":generate_cached_patches_cc_file",
":generate_html_cc_file",
":generate_html_common_cc_file",
+ ":generate_indexed_db_cc_file",
+ ":generate_io_cc_file",
+ ":generate_io_patch_cc_file",
":generate_js_cc_file",
":generate_js_util_cc_file",
- ":generate_blink_cc_file",
- ":generate_indexed_db_cc_file",
- ":generate_cached_patches_cc_file",
- ":generate_web_gl_cc_file",
":generate_metadata_cc_file",
- ":generate_web_sql_cc_file",
":generate_svg_cc_file",
":generate_web_audio_cc_file",
+ ":generate_web_gl_cc_file",
+ ":generate_web_sql_cc_file",
"..:libdart_nosnapshot_with_precompiler",
]
extra_defines = [ "NO_OBSERVATORY" ]
@@ -745,21 +756,22 @@ dart_executable("dart_bootstrap") {
"snapshot_empty.cc",
# Include generated source files.
+ "$target_gen_dir/blink_gen.cc",
"$target_gen_dir/builtin_gen.cc",
+ "$target_gen_dir/cached_patches_gen.cc",
+ "$target_gen_dir/html_common_gen.cc",
+ "$target_gen_dir/html_gen.cc",
+ "$target_gen_dir/indexed_db_gen.cc",
"$target_gen_dir/io_gen.cc",
"$target_gen_dir/io_patch_gen.cc",
- "$target_gen_dir/html_gen.cc",
- "$target_gen_dir/html_common_gen.cc",
"$target_gen_dir/js_gen.cc",
"$target_gen_dir/js_util_gen.cc",
- "$target_gen_dir/blink_gen.cc",
- "$target_gen_dir/indexed_db_gen.cc",
- "$target_gen_dir/cached_patches_gen.cc",
- "$target_gen_dir/web_gl_gen.cc",
"$target_gen_dir/metadata_gen.cc",
- "$target_gen_dir/web_sql_gen.cc",
+ "$target_gen_dir/resources_gen.cc",
"$target_gen_dir/svg_gen.cc",
"$target_gen_dir/web_audio_gen.cc",
+ "$target_gen_dir/web_gl_gen.cc",
+ "$target_gen_dir/web_sql_gen.cc",
]
}
« no previous file with comments | « runtime/BUILD.gn ('k') | runtime/bin/vmservice_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698