From 3b09b3866a389435008982fea41d4e32cd6dc0e1 Mon Sep 17 00:00:00 2001 From: Miguel <1889916+miguelfrde@users.noreply.github.com> Date: Thu, 9 Jan 2020 17:28:16 -0800 Subject: [PATCH] [fuchsia] Add diagnostics directory to the remote dirs and ensure entry exists (flutter/engine#15258) This reverts commit 866b257d21b1df2e2342459da71312d19a30c581. Once https://fuchsia-review.googlesource.com/c/topaz/+/351729 lands, the diagnostics directory will be present, this would be safe to do and the roller won't be blocked again. --- .../shell/platform/fuchsia/flutter/component.cc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc index 836688004fa..438582b60d8 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/component.cc @@ -231,15 +231,21 @@ Application::Application( << "): " << zx_status_get_string(status); return; } - const char* other_dirs[] = {"debug", "ctrl"}; + const char* other_dirs[] = {"debug", "ctrl", "diagnostics"}; // add other directories as RemoteDirs. for (auto& dir_str : other_dirs) { fidl::InterfaceHandle dir; auto request = dir.NewRequest().TakeChannel(); - fdio_service_connect_at(directory_ptr_.channel().get(), dir_str, - request.release()); - outgoing_dir_->AddEntry( - dir_str, std::make_unique(dir.TakeChannel())); + auto status = fdio_service_connect_at(directory_ptr_.channel().get(), + dir_str, request.release()); + if (status == ZX_OK) { + outgoing_dir_->AddEntry( + dir_str, std::make_unique(dir.TakeChannel())); + } else { + FML_LOG(ERROR) << "could not add out directory entry(" << dir_str + << ") for flutter app(" << debug_label_ + << "): " << zx_status_get_string(status); + } } };