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

Unified Diff: runtime/bin/main.cc

Issue 2949323002: Load vmservice from a .dill file when generating AOT snapshots. (Closed)
Patch Set: Address 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 | « no previous file | runtime/bin/vmservice_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index c67e2fa68bdb50c0ca0a6ffd325e2f33d8b64c5d..cbe38ef74c80f16fe16e762e02b70a61778c33de 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -1494,7 +1494,11 @@ bool RunMainIsolate(const char* script_name, CommandLineOptions* dart_options) {
if ((gen_snapshot_kind == kAppAOT) || (gen_snapshot_kind == kAppJIT)) {
// Load the embedder's portion of the VM service's Dart code so it will
// be included in the app snapshot.
- if (!VmService::LoadForGenPrecompiled()) {
+#if defined(DART_PRECOMPILED_RUNTIME)
+ if (!VmService::LoadForGenPrecompiled(NULL)) {
+#else
+ if (!VmService::LoadForGenPrecompiled(dfe.kernel_vmservice_io())) {
+#endif // defined(DART_PRECOMPILED_RUNTIME)
Log::PrintErr("VM service loading failed: %s\n",
VmService::GetErrorMessage());
exit(kErrorExitCode);
« no previous file with comments | « no previous file | runtime/bin/vmservice_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698